Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f4288b3 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '1748-master-update_to_119' into 'master' 

Update Browser to 119

See merge request !63
parents ed0e3f49 58c8944e

build.sh

+48 −22
Original line number Diff line number Diff line
@@ -7,11 +7,13 @@ root_dir=$(dirname "$(readlink -f "$0")") 
if [ ! -d "$chromium_dir" ]; then

    chromium_dir=$root_dir

fi

chromium_version="117.0.5938.156"

chromium_version="119.0.6045.200"

chromium_code=$(echo "$chromium_version" | tr -d '.' | cut -c5-)

chromium_url=https://github.com/chromium/chromium.git

clean=0

gsync=0

history=1

test=0

arch=""



usage() {
@@ -24,6 +26,7 @@ usage() { 
    echo "    -u Show this message"

    echo "    -s Sync source"

    echo "    -h Sync without history"

    echo "    -t Sign with AOSP test-key"

    echo

    exit 1

}
@@ -49,6 +52,15 @@ build() { 
    build_args+=' android_default_version_name="'$chromium_version'"'

    build_args+=' android_default_version_code="'$code'"'



    if [ $test -eq 1 ]; then

        echo ">> [$(date)] Using AOSP test-key to sign"

        keystore_path="${root_dir}/platform.jks"

        build_args+=' android_keystore_path="'$keystore_path'"'

        build_args+=' android_keystore_name="platform"'

        build_args+=' android_keystore_password="platform"'

        build_args+=' trichrome_certdigest="c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8"'

    fi



    if [ $clean -eq 1 ]; then

        if [ -d "out/$1" ]; then

            rm -rf "out/$1"
@@ -96,50 +108,63 @@ patch() { 


    bromite_patches_list=$(cat "${root_dir}/build/bromite_patches_list.txt")

    for file in $bromite_patches_list; do

        git am -3 --ignore-whitespace "${root_dir}/build/bromite_patches/$file"

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/bromite_patches/$file"

    done



    e_patches_list=$(cat "${root_dir}/build/e_patches_list.txt")

    for file in $e_patches_list; do

        git am -3 --ignore-whitespace "${root_dir}/build/e_patches/$file"

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/e_patches/$file"

    done



    # Rename Chrome to Browser

    rename



    # domain_substitution from ungoogled-chromium

    domain_substitution

}



rename() {

    cd $chromium_dir/src



    # Translation directories

    dirs="components components/strings chrome/browser/ui/android/strings chrome/browser/ui/android/strings/translations"

    replacements=("Chrome browser=Browser" "Chrome=Browser" "Bromite=Browser" "Cromite=Browser")



    for dir in $dirs; do

        grdp_files=$(ls $dir/*.grdp 2> /dev/null | wc -l)

        if [ "$grdp_files" != "0" ]; then

	    sed -i 's/Chrome browser/Browser/g' $dir/*.grd*

	    sed -i 's/Chrome/Browser/g' $dir/*.grd*

        fi

        xtb_files=$(ls $dir/*.xtb 2> /dev/null | wc -l)

        if [ "$xtb_files" != "0" ]; then

	    sed -i 's/Chrome browser/Browser/g' $dir/*.xtb

	    sed -i 's/Chrome/Browser/g' $dir/*.xtb

        fi

    for replacement in "${replacements[@]}"; do

        replaced_string=${replacement%%=*}

        replacement_string=${replacement#*=}



        find . -type f -not -name 'foundation_e.grdp' -name '*.grd*' | while read -r filename; do

            sed -i "s/\b${replaced_string}\b/${replacement_string}/g" "$filename"

        done

        find . -type f -name '*.xtb' | while read -r filename; do

            sed -i "s/\b${replaced_string}\b/${replacement_string}/g" "$filename"

        done

    done



    git add .

    git commit -m "Browser: Replace Chrome with Browser"

}



domain_substitution() {

    cd "${root_dir}/domain_substitution"

    python3 domain_substitution.py apply -r domain_regex.list -f domain_substitution.list $chromium_dir/src

    cd $chromium_dir/src

    git add .

    git commit -m "Browser: Automated domain substitution"

}



sync() {

    echo ">> [$(date)] Syncing chromium $chromium_version"

    cd $chromium_dir

    gclient_config

    if [ -d "$chromium_dir/src" ]; then

        cd $chromium_dir/src

        git checkout main

        git fetch origin refs/tags/$chromium_version

        if [ $clean -eq 1 ]; then

            git checkout main

            git reset --hard FETCH_HEAD

        else

            git reset --hard $chromium_commit_hash

        fi

    fi

    if [ $history -eq 1 ]; then

        gclient sync -D --nohooks -R
@@ -151,11 +176,9 @@ sync() { 
}



gclient_config() {

    url=https://github.com/chromium/chromium.git

    commit_hash=$(git ls-remote --refs $url refs/tags/$chromium_version | awk '{print $1}')

    cat <<EOF > "$chromium_dir/.gclient"

solutions = [{

    "url": "$url@$commit_hash",

    "url": "$chromium_url@$chromium_commit_hash",

    "managed": False,

    "name": "src",

    "custom_deps": {},
@@ -177,13 +200,14 @@ init_repo(){ 
    fi

}



while getopts ":a:cur:sh" opt; do

while getopts ":a:cur:sht" opt; do

    case $opt in

    a) arch="$OPTARG" ;;

    c) clean=1 ;;

    u) usage ;;

    s) gsync=1  ;;

    h) history=0 ;;

    t) test=1 ;;

    :)

        echo "Option -$OPTARG requires an argument"

        echo
@@ -204,6 +228,8 @@ if [ ! -d "$chromium_dir/depot_tools" ]; then 
fi

export PATH="$chromium_dir/depot_tools:$PATH"



chromium_commit_hash=$(git ls-remote --refs $chromium_url refs/tags/$chromium_version | awk '{print $1}')



if [ $clean -eq 1 ]; then

    echo ">> [$(date)] Cleaning chromium source code"

    if [ -d "$chromium_dir/src" ]; then

build/bromite_patches/00AdblockPlus-add-blocking-in-service-workers.patch

+20 −20
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/browser/adblock/adblock_content_browser_client.cc

--- a/chrome/browser/adblock/adblock_content_browser_client.cc

+++ b/chrome/browser/adblock/adblock_content_browser_client.cc

@@ -45,6 +45,7 @@

@@ -43,6 +43,7 @@

 #include "content/public/browser/web_contents.h"

 #include "mojo/public/cpp/bindings/self_owned_receiver.h"

 #include "services/network/public/mojom/websocket.mojom.h"
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 #include "services/service_manager/public/cpp/binder_registry.h"

 #include "third_party/blink/public/common/loader/url_loader_throttle.h"

 

@@ -58,6 +59,29 @@

@@ -56,6 +57,29 @@

 

 namespace {
@@ -60,7 +60,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 bool IsFilteringNeeded(content::RenderFrameHost* frame) {

   if (frame) {

     auto* profile =

@@ -65,17 +89,7 @@ bool IsFilteringNeeded(content::RenderFrameHost* frame) {

@@ -63,17 +87,7 @@ bool IsFilteringNeeded(content::RenderFrameHost* frame) {

     if (profile) {

       content::RenderFrameHost* embedder = frame->GetOutermostMainFrameOrEmbedder();

       const auto& embedder_url = embedder->GetLastCommittedURL();
@@ -79,7 +79,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
     }

   }

   return false;

@@ -90,6 +104,8 @@ class AdblockContextData : public base::SupportsUserData::Data {

@@ -88,6 +102,8 @@ class AdblockContextData : public base::SupportsUserData::Data {

 

   static void StartProxying(

       Profile* profile,
@@ -88,7 +88,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
       content::RenderFrameHost* frame,

       int render_process_id,

       mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver,

@@ -102,8 +118,6 @@ class AdblockContextData : public base::SupportsUserData::Data {

@@ -100,8 +116,6 @@ class AdblockContextData : public base::SupportsUserData::Data {

       self = new AdblockContextData();

       profile->SetUserData(kAdblockContextUserDataKey, base::WrapUnique(self));

     }
@@ -97,7 +97,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
     adblock::AdblockURLLoaderFactoryConfig config{

         adblock::SubscriptionServiceFactory::GetForBrowserContext(

             browser_context),

@@ -115,8 +129,9 @@ class AdblockContextData : public base::SupportsUserData::Data {

@@ -113,8 +127,9 @@ class AdblockContextData : public base::SupportsUserData::Data {

             browser_context)};

     auto proxy = std::make_unique<adblock::AdblockURLLoaderFactory>(

         std::move(config),
@@ -108,7 +108,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
         std::move(receiver), std::move(target_factory),

         embedder_support::GetUserAgent(),

         base::BindOnce(&AdblockContextData::RemoveProxy,

@@ -157,47 +172,50 @@ void AdblockContentBrowserClient::ForceAdblockProxyForTesting() {

@@ -155,47 +170,50 @@ void AdblockContentBrowserClient::ForceAdblockProxyForTesting() {

 #endif

 

 bool AdblockContentBrowserClient::WillInterceptWebSocket(
@@ -176,7 +176,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
   auto* subscription_service =

       adblock::SubscriptionServiceFactory::GetForBrowserContext(

           browser_context);

@@ -205,33 +223,33 @@ void AdblockContentBrowserClient::CreateWebSocketInternal(

@@ -203,33 +221,33 @@ void AdblockContentBrowserClient::CreateWebSocketInternal(

       adblock::ResourceClassificationRunnerFactory::GetForBrowserContext(

           browser_context);

   classification_runner->CheckRequestFilterMatchForWebSocket(
@@ -218,7 +218,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
           std::move(handshake_client));

       return;

     }

@@ -248,6 +266,72 @@ void AdblockContentBrowserClient::OnWebSocketFilterCheckCompleted(

@@ -246,6 +264,72 @@ void AdblockContentBrowserClient::OnWebSocketFilterCheckCompleted(

   VLOG(1) << "[eyeo] Web socket blocked for " << url;

 }
@@ -291,7 +291,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

     content::BrowserContext* browser_context,

     content::RenderFrameHost* frame,

@@ -271,24 +355,12 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

@@ -269,24 +353,12 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

           navigation_id, ukm_source_id, factory_receiver, header_client,

           bypass_redirect_checks, disable_secure_dns, factory_override,

           navigation_response_task_runner);
@@ -320,7 +320,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 

   bool use_test_loader = false;

 #ifdef EYEO_INTERCEPT_DEBUG_URL

@@ -307,7 +379,7 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

@@ -305,7 +377,7 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

     mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory_remote;

     *factory_receiver = target_factory_remote.InitWithNewPipeAndPassReceiver();

     AdblockContextData::StartProxying(
@@ -401,7 +401,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.h b/chrome/br 
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -6252,7 +6252,9 @@ ChromeContentBrowserClient::

@@ -6330,7 +6330,9 @@ ChromeContentBrowserClient::

 }

 

 bool ChromeContentBrowserClient::WillInterceptWebSocket(
@@ -412,7 +412,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 
 #if BUILDFLAG(ENABLE_EXTENSIONS)

   if (!frame) {

     return false;

@@ -6273,9 +6275,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(

@@ -6351,9 +6353,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(

 }

 

 void ChromeContentBrowserClient::CreateWebSocket(
@@ -427,7 +427,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -610,11 +610,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

@@ -624,11 +624,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

   CreateURLLoaderHandlerForServiceWorkerNavigationPreload(

       int frame_tree_node_id,

       const network::ResourceRequest& resource_request) override;
@@ -495,7 +495,7 @@ diff --git a/components/adblock/content/browser/adblock_url_loader_factory.h b/c 
 

 namespace adblock {

 

@@ -49,6 +50,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

@@ -57,6 +58,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

 

   AdblockURLLoaderFactory(

       AdblockURLLoaderFactoryConfig config,
@@ -503,7 +503,7 @@ diff --git a/components/adblock/content/browser/adblock_url_loader_factory.h b/c 
       content::GlobalRenderFrameHostId host_id,

       mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver,

       mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory,

@@ -78,6 +80,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

@@ -86,6 +88,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

   void MaybeDestroySelf();

 

   AdblockURLLoaderFactoryConfig config_;
@@ -683,7 +683,7 @@ diff --git a/content/browser/websockets/websocket_connector_impl.cc b/content/br 
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc

--- a/content/public/browser/content_browser_client.cc

+++ b/content/public/browser/content_browser_client.cc

@@ -967,7 +967,7 @@ bool ContentBrowserClient::WillCreateURLLoaderFactory(

@@ -998,7 +998,7 @@ bool ContentBrowserClient::WillCreateURLLoaderFactory(

   return false;

 }
@@ -692,7 +692,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b 
   return false;

 }

 

@@ -976,9 +976,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {

@@ -1007,9 +1007,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {

 }

 

 void ContentBrowserClient::CreateWebSocket(
@@ -707,7 +707,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b 
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h

--- a/content/public/browser/content_browser_client.h

+++ b/content/public/browser/content_browser_client.h

@@ -1746,7 +1746,7 @@ class CONTENT_EXPORT ContentBrowserClient {

@@ -1791,7 +1791,7 @@ class CONTENT_EXPORT ContentBrowserClient {

       scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner);

 

   // Returns true when the embedder wants to intercept a websocket connection.
@@ -716,7 +716,7 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/br 
 

   // Returns the WebSocket creation options.

   virtual uint32_t GetWebSocketOptions(RenderFrameHost* frame);

@@ -1768,9 +1768,11 @@ class CONTENT_EXPORT ContentBrowserClient {

@@ -1813,9 +1813,11 @@ class CONTENT_EXPORT ContentBrowserClient {

   // Always called on the UI thread and only when the Network Service is

   // enabled.

   virtual void CreateWebSocket(

build/bromite_patches/00Add-cromite-flags-support.patch

0 → 100644
+1167 −0

File added.

Preview size limit exceeded, changes collapsed.

build/e_patches/0007-Browser-fix-help-icon-crash.patch→build/bromite_patches/00Disable-Feeback-Collector.patch

+55 −0
Original line number Diff line number Diff line 
From b8b3070fdad7abfb853dab6fe065ef2a701468fa Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 20 Oct 2023 21:49:42 +0530

Subject: [PATCH 7/8] Browser: fix help icon crash

From: uazo <uazo@users.noreply.github.com>

Date: Sat, 22 Jul 2023 13:58:40 +0000

Subject: Disable Feeback Collector



License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

---

 .../chrome/browser/feedback/FeedbackCollector.java       | 9 +++++----

 1 file changed, 5 insertions(+), 4 deletions(-)

 .../browser/feedback/FeedbackCollector.java   | 27 +++----------------

 1 file changed, 3 insertions(+), 24 deletions(-)



diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

index cea9d24efc3ec..0d0d94bbd0cac 100644

--- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

+++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

@@ -28,6 +28,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
@@ -19,25 +18,38 @@ index cea9d24efc3ec..0d0d94bbd0cac 100644 
 import java.util.List;

 import java.util.Map;

 

@@ -66,14 +67,14 @@ public abstract class FeedbackCollector<T> implements Runnable {

@@ -64,30 +65,8 @@ public abstract class FeedbackCollector<T> implements Runnable {

     // Subclasses must invoke init() at construction time.

     protected void init(Activity activity, @Nullable ScreenshotSource screenshotTask, T initParams,

             Profile profile) {

         // 1. Build all synchronous and asynchronous sources and determine the currently signed in

         //    account.

-        // 1. Build all synchronous and asynchronous sources and determine the currently signed in

-        //    account.

-        mSynchronousSources = buildSynchronousFeedbackSources(activity, initParams);

-        mAsynchronousSources = buildAsynchronousFeedbackSources(initParams);

-        IdentityManager identityManager =

-                IdentityServicesProvider.get().getIdentityManager(profile);

-        if (identityManager != null) {

-            mAccountInUse = CoreAccountInfo.getEmailFrom(

-                    identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN));

-        }

-

-        // Validation check in case a source is added to the wrong list.

-        for (FeedbackSource source : mSynchronousSources) {

-            assert !(source instanceof AsyncFeedbackSource);

-        }

-

-        // 2. Set |mScreenshotTask| if not null.

-        if (screenshotTask != null) mScreenshotTask = screenshotTask;

-

-        // 3. Start all asynchronous sources and the screenshot task.

-        for (var source : mAsynchronousSources) {

-            source.start(this);

-        }

-        if (mScreenshotTask != null) mScreenshotTask.capture(this);

+        mSynchronousSources = new ArrayList<>();

+        mAsynchronousSources = new ArrayList<>();

+        /*IdentityManager identityManager =

                 IdentityServicesProvider.get().getIdentityManager(profile);

         if (identityManager != null) {

             mAccountInUse = CoreAccountInfo.getEmailFrom(

                     identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN));

-        }

+        }*/

 

         // Validation check in case a source is added to the wrong list.

         for (FeedbackSource source : mSynchronousSources) {

         // 4. Kick off a task to timeout the async sources.

         ThreadUtils.postOnUiThreadDelayed(this, TIMEOUT_MS);

--

2.34.1

2.25.1

build/bromite_patches/Enable-ImprovedBookmarks-by-default.patch→build/bromite_patches/00Enable-ImprovedBookmarks-by-default.patch

+29 −42
Original line number Diff line number Diff line
@@ -4,36 +4,29 @@ Subject: Enable ImprovedBookmarks by default 


License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

---

 chrome/android/java/res/layout/bookmark_search_box_row.xml  | 6 +++---

 chrome/android/java/res/layout/bookmark_search_box_row.xml    | 4 ++--

 .../chromium/chrome/browser/bookmarks/BookmarkFeatures.java   | 2 +-

 .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java     | 2 ++

 .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java    | 2 +-

 .../chromium/chrome/browser/bookmarks/BookmarkUtils.java    | 3 ++-

 chrome/browser/flags/android/chrome_feature_list.cc         | 2 +-

 6 files changed, 10 insertions(+), 7 deletions(-)

 .../org/chromium/chrome/browser/bookmarks/BookmarkUtils.java  | 3 ++-

 .../Enable-ImprovedBookmarks-by-default.inc                   | 1 +

 6 files changed, 9 insertions(+), 5 deletions(-)

 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc



diff --git a/chrome/android/java/res/layout/bookmark_search_box_row.xml b/chrome/android/java/res/layout/bookmark_search_box_row.xml

--- a/chrome/android/java/res/layout/bookmark_search_box_row.xml

+++ b/chrome/android/java/res/layout/bookmark_search_box_row.xml

@@ -31,9 +31,9 @@ found in the LICENSE file.

       android:textAppearance="@style/TextAppearance.TextLarge.Primary" />

@@ -58,8 +58,8 @@ found in the LICENSE file.

 

   <LinearLayout

-        android:layout_height="48dp"

+        android:layout_height="wrap_content"

     android:layout_width="match_parent"

-    android:layout_height="48dp"

-    android:layout_marginTop="6dp"

+    android:layout_height="wrap_content"

+    android:layout_marginTop="0dp"

     android:orientation="horizontal">

 

     <org.chromium.components.browser_ui.widget.chips.ChipView

@@ -43,4 +43,4 @@ found in the LICENSE file.

 

     </LinearLayout>

 

-</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>

\ No newline at end of file

+</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
@@ -57,25 +50,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 
 

 import androidx.annotation.DrawableRes;

 import androidx.annotation.StringRes;

@@ -20,6 +21,7 @@ class BookmarkSearchBoxRowViewBinder {

     static void bind(PropertyModel model, View view, PropertyKey key) {

@@ -53,6 +54,7 @@ class BookmarkSearchBoxRowViewBinder {

     private void bindInternal(PropertyModel model, View view, PropertyKey key) {

         BookmarkSearchBoxRow row = (BookmarkSearchBoxRow) view;

         ChipView shoppingChip = view.findViewById(R.id.shopping_filter_chip);

+        shoppingChip.setVisibility(ViewGroup.GONE);

         if (key == BookmarkSearchBoxRowProperties.QUERY_CALLBACK) {

             row.setQueryCallback(model.get(BookmarkSearchBoxRowProperties.QUERY_CALLBACK));

         } else if (key == BookmarkSearchBoxRowProperties.SHOPPING_CHIP_VISIBILITY) {

         if (key == BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK) {

             Callback<String> callback =

                     wrapCallback(model, BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK);

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

@@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy;

@@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy;

  */

 public class BookmarkUiPrefs {

     private static final @BookmarkRowDisplayPref int INITIAL_BOOKMARK_ROW_DISPLAY_PREF =

-            BookmarkRowDisplayPref.VISUAL;

+            BookmarkRowDisplayPref.COMPACT;

     private static final @BookmarkRowSortOrder int INITIAL_BOOKMARK_ROW_SORT_ORDER =

             BookmarkRowSortOrder.REVERSE_CHRONOLOGICAL;

             BookmarkRowSortOrder.MANUAL;

 

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -97,17 +90,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 
             showBookmarkManagerOnTablet(context,

                     activity == null ? null : activity.getComponentName(), url, isIncognito);

         } else {

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -495,7 +495,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification,

 

 BASE_FEATURE(kAndroidImprovedBookmarks,

              "AndroidImprovedBookmarks",

-             base::FEATURE_DISABLED_BY_DEFAULT);

+             base::FEATURE_ENABLED_BY_DEFAULT);

 

 BASE_FEATURE(kAnimatedImageDragShadow,

              "AnimatedImageDragShadow",

diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc

new file mode 100644

--- /dev/null

+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc

@@ -0,0 +1 @@

+SET_CROMITE_FEATURE_ENABLED(kAndroidImprovedBookmarks);

--

2.25.1