From: uazo <uazo@users.noreply.github.com>
Date: Tue, 12 Sep 2023 12:39:23 +0000
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    | 4 ++--
 .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java     | 2 ++
 .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java    | 2 +-
 .../org/chromium/chrome/browser/bookmarks/BookmarkUtils.java  | 3 ++-
 .../org/chromium/chrome/browser/flags/ChromeFeatureList.java  | 2 +-
 components/bookmarks/browser/bookmark_node.cc                 | 3 +--
 .../Enable-ImprovedBookmarks-by-default.inc                   | 1 +
 7 files changed, 10 insertions(+), 7 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
@@ -58,8 +58,8 @@ found in the LICENSE file.
 
   <LinearLayout
     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
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.bookmarks;
 
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
@@ -34,6 +35,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.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
@@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy;
 /** Self-documenting preference class for bookmarks. */
 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.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
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.app.bookmarks.BookmarkActivity;
 import org.chromium.chrome.browser.app.bookmarks.BookmarkAddEditFolderActivity;
 import org.chromium.chrome.browser.app.bookmarks.BookmarkEditActivity;
 import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderSelectActivity;
+import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;
 import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs.BookmarkRowDisplayPref;
 import org.chromium.chrome.browser.commerce.ShoppingServiceFactory;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
@@ -526,7 +527,7 @@ public class BookmarkUtils {
             RecordUserAction.record("MobileBookmarkManagerReopenBookmarksInSameSession");
         }
 
-        if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {
+        if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled() || DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {
             showBookmarkManagerOnTablet(
                     context,
                     activity == null ? null : activity.getComponentName(),
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -797,7 +797,7 @@ public abstract class ChromeFeatureList {
     public static final MutableFlagWithSafeDefault sAdvancedPeripheralsSupportTabStrip =
             newMutableFlagWithSafeDefault(ADVANCED_PERIPHERALS_SUPPORT_TAB_STRIP, true);
     public static final MutableFlagWithSafeDefault sAndroidImprovedBookmarks =
-            newMutableFlagWithSafeDefault(ANDROID_IMPROVED_BOOKMARKS, false);
+            newMutableFlagWithSafeDefault(ANDROID_IMPROVED_BOOKMARKS, true);
     public static final MutableFlagWithSafeDefault sDeferKeepScreenOnDuringGesture =
             newMutableFlagWithSafeDefault(DEFER_KEEP_SCREEN_ON_DURING_GESTURE, false);
     public static final MutableFlagWithSafeDefault sDeferNotifyInMotion =
diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc
--- a/components/bookmarks/browser/bookmark_node.cc
+++ b/components/bookmarks/browser/bookmark_node.cc
@@ -171,8 +171,7 @@ bool BookmarkPermanentNode::IsTypeVisibleWhenEmpty(Type type) {
     case BookmarkNode::BOOKMARK_BAR:
       return is_desktop;
     case BookmarkNode::OTHER_NODE:
-      return is_desktop || base::FeatureList::IsEnabled(
-                               kAllBookmarksBaselineFolderVisibility);
+      return true;
     case BookmarkNode::MOBILE:
       // Either MOBILE or OTHER_NODE is visible when empty, but never both.
       return !IsTypeVisibleWhenEmpty(BookmarkNode::OTHER_NODE);
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);
--