Upgrade from Chromium 134 to Chromium 135

android/brave_java_resources.gni

@@ -972,8 +972,8 @@ brave_java_resources = [
   "java/res/values/brave_ids.xml",
   "java/res/values/brave_styles.xml",
   "java/res/values/shimmer_attrs.xml",
-  "java/res/xml/appearance_preferences.xml",
   "java/res/xml/background_images_preferences.xml",
+  "java/res/xml/brave_appearance_preferences.xml",
   "java/res/xml/brave_download_preferences.xml",
   "java/res/xml/brave_ethereum_preferences.xml",
   "java/res/xml/brave_leo_default_model_preferences.xml",

android/brave_java_sources.gni

@@ -8,6 +8,7 @@ import("//brave/android/feed/brave_feed_java_sources.gni")
 import("//brave/android/java/org/chromium/chrome/browser/billing/sources.gni")
 import("//brave/android/java/org/chromium/chrome/browser/playlist/sources.gni")
 import("//brave/base/brave_base_shared_preferences_java.gni")
+import("//brave/browser/bookmarks/android/sources.gni")
 import("//brave/browser/brave_ads/android/java_sources.gni")
 import("//brave/browser/hub/internal/android/java/java_sources.gni")
 import("//brave/browser/incognito/android/java_sources.gni")
@@ -65,15 +66,12 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/autofill/BraveAutofillBackgroundServiceImpl.java",
   "../../brave/android/java/org/chromium/chrome/browser/autofill/BraveAutofillService.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.java",
-  "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkDelegate.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkImportExportDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java",
-  "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkModel.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbar.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java",
-  "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUiPrefs.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoMojomHelper.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoPlansActivity.java",

android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd

@@ -335,7 +335,7 @@
       </message>
 
       <!-- Tab Grid Dialog strings -->
-      <message name="IDS_TAB_GRID_DIALOG_REMOVE_FROM_GROUP" desc="This text shows on the ungroup bar in TabGridDialog. When user drags a tab and drops it on the ungroup bar, this tab will be moved out of the group.">
+      <message name="IDS_REMOVE_TAB_FROM_GROUP" desc="Content description for an action which removes a tab from its group.">
         Remove from group
       </message>
       <message name="IDS_TAB_GRID_DIALOG_TOOLBAR_EDIT_GROUP_NAME" desc="This text shows in the TabGridDialog toolbar menu as one menu item. When user selects this item, the group name field will be focused and the keyboard will show for users to edit the group name.">
@@ -351,7 +351,7 @@
         Close group
       </message>
       <message name="IDS_TAB_GRID_DIALOG_TOOLBAR_MANAGE_SHARING" desc="This text shows in the TabGridDialog toolbar menu as one menu item. When user selects this item, the manage sharing UI is shown.">
-        Manage sharing
+        Manage access
       </message>
       <message name="IDS_TAB_GRID_DIALOG_TOOLBAR_RECENT_ACTIVITY" desc="This text shows in the TabGridDialog toolbar menu as one menu item. When user selects this item, the recent activity UI is shown.">
         Recent activity
@@ -726,6 +726,45 @@
           other {Created <ph name="NUM_YEARS_MANY">%d<ex>2</ex></ph> years ago}
         }
       </message>
+      <message name="IDS_TAB_GROUPS_UPDATED_AGO_NOW" desc="A subtitle on a row for a tab group. Explains the group was updated less than a minute ago.">
+        Updated just now
+      </message>
+      <message name="IDS_TAB_GROUPS_UPDATED_AGO_MINUTES" desc="A subtitle on a row for a tab group. Explains how many minutes ago the group was updated.">
+        {NUM_MINS, plural,
+          =1 {Updated <ph name="NUM_MINS_ONE">%d<ex>1</ex></ph> minute ago}
+          other {Updated <ph name="NUM_MINS_MANY">%d<ex>2</ex></ph> minutes ago}
+        }
+      </message>
+      <message name="IDS_TAB_GROUPS_UPDATED_AGO_HOURS" desc="A subtitle on a row for a tab group. Explains how many hours ago the group was updated.">
+        {NUM_HOURS, plural,
+          =1 {Updated <ph name="NUM_HOURS_ONE">%d<ex>1</ex></ph> hour ago}
+          other {Updated <ph name="NUM_HOURS_MANY">%d<ex>2</ex></ph> hours ago}
+        }
+      </message>
+      <message name="IDS_TAB_GROUPS_UPDATED_AGO_DAYS" desc="A subtitle on a row for a tab group. Explains how many days ago the group was updated.">
+        {NUM_DAYS, plural,
+          =1 {Updated <ph name="NUM_DAYS_ONE">%d<ex>1</ex></ph> day ago}
+          other {Updated <ph name="NUM_DAYS_MANY">%d<ex>2</ex></ph> days ago}
+        }
+      </message>
+      <message name="IDS_TAB_GROUPS_UPDATED_AGO_WEEKS" desc="A subtitle on a row for a tab group. Explains how many weeks ago the group was updated.">
+        {NUM_WEEKS, plural,
+          =1 {Updated <ph name="NUM_WEEKS_ONE">%d<ex>1</ex></ph> week ago}
+          other {Updated <ph name="NUM_WEEKS_MANY">%d<ex>2</ex></ph> weeks ago}
+        }
+      </message>
+      <message name="IDS_TAB_GROUPS_UPDATED_AGO_MONTHS" desc="A subtitle on a row for a tab group. Explains how many months ago the group was updated.">
+              {NUM_MONTHS, plural,
+                =1 {Updated <ph name="NUM_MONTHS_ONE">%d<ex>1</ex></ph> month ago}
+                other {Updated <ph name="NUM_MONTHS_MANY">%d<ex>2</ex></ph> months ago}
+              }
+            </message>
+      <message name="IDS_TAB_GROUPS_UPDATED_AGO_YEARS" desc="A subtitle on a row for a tab group. Explains how many years ago the group was updated.">
+        {NUM_MONTHS, plural,
+          =1 {Updated <ph name="NUM_YEARS_ONE">%d<ex>1</ex></ph> year ago}
+          other {Updated <ph name="NUM_YEARS_MANY">%d<ex>2</ex></ph> years ago}
+        }
+      </message>
       <message name="IDS_PLUS_HIDDEN_TAB_COUNT" desc="A string to show how many other tabs are contained in a tab group who's favicons are not shown. [CHAR_LIMIT=5]">
         +<ph name="HIDDEN_TABS_COUNT">%1$s<ex>3</ex></ph>
       </message>
@@ -989,12 +1028,46 @@ If you delete it, everyone will immediately lose access to the "<ph name="TITLE_
       </message>
 
       <!-- Tab Group Removed Message Strings -->
-      <message name="IDS_TAB_GROUP_REMOVED_MESSAGE_CARD_DESCRIPTION" desc="Description text on the message card which is shown when user is no longer a part of the tab group. [CHAR_LIMIT=40]">
-        <ph name="TAB_GROUP_NAME">%1$s<ex>Vacation</ex></ph> tab group no longer available
-      </message>
+      <message name="IDS_ONE_TAB_GROUP_REMOVED_MESSAGE_CARD_DESCRIPTION" desc="Description text on the message card which is shown when user is no longer a part of one tab group. [CHAR_LIMIT=40]">
+        "<ph name="TAB_GROUP_NAME">%1$s<ex>Vacation</ex></ph>" tab group no longer available
+      </message>
+      <message name="IDS_TWO_TAB_GROUPS_REMOVED_MESSAGE_CARD_DESCRIPTION" desc="Description text on the message card which is shown when user is no longer a part of two tab groups. [CHAR_LIMIT=60]">
+         "<ph name="TAB_GROUP_NAME_1">%1$s<ex>Travel</ex></ph>" and "<ph name="TAB_GROUP_NAME_2">%2$s<ex>Vacation</ex></ph>" tab groups no longer available
+      </message>
+      <message name="IDS_GENERIC_TAB_GROUPS_REMOVED_MESSAGE_CARD_DESCRIPTION" desc="Generic description text on the message card which is shown when user is no longer a part of 1 or more tab groups. [CHAR_LIMIT=40]">
+          {TAB_GROUPS_COUNT, plural,
+            =1 {<ph name="TAB_GROUPS_COUNT_ONE">%1$d<ex>1</ex></ph> tab group no longer available}
+            other {<ph name="TAB_GROUPS_COUNT_MANY">%1$d<ex>5</ex></ph> tab groups no longer available}
+          }
+       </message>
       <message name="IDS_ACCESSIBILITY_TAB_GROUP_REMOVED_DISMISS_BUTTON" desc="The accessibility text to read when the 'X' button on the tab removed message card is focused">
         Dismiss the card.
       </message>
+
+      <!-- Tab context menu (for individual tabs) -->
+      <message name="IDS_ADD_TAB_TO_GROUP" desc="Content description for an action which adds a tab to a group.">
+        Add to group
+      </message>
+
+      <!-- Tab Group List Bottom Sheet -->
+      <message name="IDS_TAB_GROUP_LIST_BOTTOM_SHEET_TITLE" desc="Title text for a bottom sheet which is used to add a tab to a tab group.">
+        Add to
+      </message>
+      <message name="IDS_CREATE_NEW_GROUP_ROW_TITLE" desc="Description text for an option in a bottom sheet to create a new tab group.">
+        New tab group
+      </message>
+      <message name="IDS_TAB_GROUP_LIST_BOTTOM_SHEET_CONTENT_DESCRIPTION" desc="The content description for the bottom sheet containing a list of tab groups.">
+        Select tab group
+      </message>
+      <message name="IDS_TAB_GROUP_LIST_BOTTOM_SHEET_HALF_HEIGHT" desc="The content description for the bottom sheet containing a list of tab groups, when opened at half height.">
+        Tab group list, opened at half height
+      </message>
+      <message name="IDS_TAB_GROUP_LIST_BOTTOM_SHEET_FULL_HEIGHT" desc="The content description for the bottom sheet containing a list of tab groups, when opened at full height.">
+        Tab group list, opened at full height
+      </message>
+      <message name="IDS_TAB_GROUP_LIST_BOTTOM_SHEET_CLOSED" desc="The accessibility announcement made when the bottom sheet containing a list of tab groups is closed.">
+        Tab group list closed
+      </message>
     </messages>
   </release>
 </grit>

android/java/apk_for_test.flags

@@ -202,7 +202,6 @@
 
 -keep class org.chromium.chrome.browser.bookmarks.BookmarkUtils {
     *** addOrEditBookmark(...);
-    *** showBookmarkManagerOnPhone(...);
     *** isSpecialFolder(...);
 }
 
@@ -893,10 +892,6 @@
     public <init>(...);
 }
 
--keep class org.chromium.chrome.browser.undo_tab_close_snackbar.UndoBarController {
-    *** showUndoBar(...);
-}
-
 -keep class org.chromium.chrome.browser.tabbed_mode.TabbedNavigationBarColorController {
     *** mContext;
     *** mTabModelSelector;

android/java/org/chromium/chrome/browser/BraveAppHooks.java

@@ -5,11 +5,14 @@
 
 package org.chromium.chrome.browser;
 
+import org.chromium.base.Callback;
 import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
 
 public class BraveAppHooks extends AppHooks {
+    /** Async fetch the iterator of partner bookmarks (or null if not available). */
     @Override
-    public PartnerBookmark.BookmarkIterator getPartnerBookmarkIterator() {
-        return null;
+    public void requestPartnerBookmarkIterator(
+            Callback<PartnerBookmark.BookmarkIterator> callback) {
+        callback.onResult(null);
     }
 }

android/java/org/chromium/chrome/browser/BraveSwipeRefreshHandler.java

@@ -5,6 +5,8 @@
 
 package org.chromium.chrome.browser;
 
+import androidx.annotation.NonNull;
+
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.TabUtils;
 import org.chromium.ui.OverscrollAction;
@@ -18,8 +20,10 @@ public class BraveSwipeRefreshHandler extends SwipeRefreshHandler {
     public Tab mTab;
 
     // There is a direct patch for SwipeRefreshHandler to make it's ctor public
-    public BraveSwipeRefreshHandler(Tab tab) {
-        super(tab);
+    public BraveSwipeRefreshHandler(
+            Tab tab,
+            @NonNull SwipeRefreshHandler.SwipeRefreshLayoutCreator swipeRefreshLayoutCreator) {
+        super(tab, swipeRefreshLayoutCreator);
     }
 
     @Override

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -2450,6 +2450,12 @@ public void addOrEditBookmark(final Tab tabToBookmark) {
         ((TabBookmarker) mTabBookmarkerSupplier.get()).addOrEditBookmark(tabToBookmark);
     }
 
+    public void showBookmarkManager(Profile profile) {
+        if (mBookmarkManagerOpenerSupplier.get() != null) {
+            mBookmarkManagerOpenerSupplier.get().showBookmarkManager(this, profile);
+        }
+    }
+
     // We call that method with an interval
     // BraveSafeBrowsingApiHandler.SAFE_BROWSING_INIT_INTERVAL_MS,
     // as upstream does, to keep the GmsCore process alive.

android/java/org/chromium/chrome/browser/app/bookmarks/BraveBookmarkActivity.java

@@ -10,6 +10,7 @@
 
 import org.chromium.chrome.browser.bookmarks.BookmarkManagerCoordinator;
 import org.chromium.chrome.browser.bookmarks.BraveBookmarkManagerCoordinator;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.IntentRequestTracker;
 
@@ -19,14 +20,14 @@ public class BraveBookmarkActivity extends BookmarkActivity {
     private ActivityWindowAndroid mWindowAndroid;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    protected void onProfileAvailable(Profile profile) {
+        super.onProfileAvailable(profile);
 
         IntentRequestTracker intentRequestTracker = IntentRequestTracker.createFromActivity(this);
         mWindowAndroid =
                 new ActivityWindowAndroid(
                         this, true, intentRequestTracker, null, /* trackOcclusion= */ false);
-        mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState);
+
         if (mBookmarkManagerCoordinator instanceof BraveBookmarkManagerCoordinator) {
             ((BraveBookmarkManagerCoordinator) mBookmarkManagerCoordinator)
                     .setWindow(mWindowAndroid);

android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java

@@ -8,6 +8,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.chromium.chrome.browser.profiles.Profile;
@@ -19,21 +20,21 @@ public class BraveBookmarkManagerCoordinator extends BookmarkManagerCoordinator
     private BookmarkManagerMediator mMediator;
 
     public BraveBookmarkManagerCoordinator(
-            Context context,
-            ComponentName openBookmarkComponentName,
+            @NonNull Context context,
             boolean isDialogUi,
-            SnackbarManager snackbarManager,
-            Profile profile,
-            BookmarkUiPrefs bookmarkUiPrefs,
-            @Nullable Runnable bookmarkOpenedCallback) {
+            @NonNull SnackbarManager snackbarManager,
+            @NonNull Profile profile,
+            @NonNull BookmarkUiPrefs bookmarkUiPrefs,
+            @NonNull BookmarkOpener bookmarkOpener,
+            @Nullable ComponentName openBookmarkComponentName) {
         super(
                 context,
-                openBookmarkComponentName,
                 isDialogUi,
                 snackbarManager,
                 profile,
                 bookmarkUiPrefs,
-                bookmarkOpenedCallback);
+                bookmarkOpener,
+                openBookmarkComponentName);
     }
 
     public void setWindow(ActivityWindowAndroid window) {

android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java

@@ -7,6 +7,9 @@
 
 import android.content.ComponentName;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -17,11 +20,12 @@ public class BraveBookmarkPage extends BookmarkPage {
     private BookmarkManagerCoordinator mBookmarkManagerCoordinator;
 
     public BraveBookmarkPage(
-            ComponentName componentName,
-            SnackbarManager snackbarManager,
-            Profile profile,
-            NativePageHost host) {
-        super(componentName, snackbarManager, profile, host);
+            @NonNull SnackbarManager snackbarManager,
+            @NonNull Profile profile,
+            @NonNull NativePageHost host,
+            @Nullable ComponentName componentName) {
+        super(snackbarManager, profile, host, componentName);
+
         if (mBookmarkManagerCoordinator instanceof BraveBookmarkManagerCoordinator
                 && BraveActivity.getChromeTabbedActivity() != null) {
             ((BraveBookmarkManagerCoordinator) mBookmarkManagerCoordinator)

android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java

@@ -8,6 +8,7 @@
 import android.content.Context;
 
 import org.chromium.base.supplier.OneshotSupplier;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.browser_ui.widget.dragreorder.DragReorderableRecyclerViewAdapter;
 import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
@@ -23,6 +24,7 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
 
     BraveBookmarkToolbarCoordinator(
             Context context,
+            Profile profile,
             SelectableListLayout<BookmarkId> selectableListLayout,
             SelectionDelegate<BookmarkId> selectionDelegate,
             SearchDelegate searchDelegate,
@@ -38,6 +40,7 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
             BooleanSupplier incognitoEnabledSupplier) {
         super(
                 context,
+                profile,
                 selectableListLayout,
                 selectionDelegate,
                 searchDelegate,

android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java

@@ -6,17 +6,12 @@
 package org.chromium.chrome.browser.bookmarks;
 
 import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.chromium.base.Callback;
-import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
-import org.chromium.chrome.browser.IntentHandler;
-import org.chromium.chrome.browser.app.bookmarks.BraveBookmarkActivity;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkItem;
@@ -56,26 +51,11 @@ public static void addOrEditBookmark(
                 fromExplicitTrackUi);
     }
 
-    public static void showBookmarkManagerOnPhone(
-            Activity activity, String url, boolean isIncognito) {
-        Intent intent =
-                new Intent(activity == null ? ContextUtils.getApplicationContext() : activity,
-                        BraveBookmarkActivity.class);
-        intent.putExtra(IntentHandler.EXTRA_INCOGNITO_MODE, isIncognito);
-        intent.setData(Uri.parse(url));
-        if (activity != null) {
-            // Start from an existing activity.
-            intent.putExtra(IntentHandler.EXTRA_PARENT_COMPONENT, activity.getComponentName());
-            activity.startActivity(intent);
-        } else {
-            // Start a new task.
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            IntentHandler.startActivityForTrustedIntent(intent);
-        }
-    }
-
-    public static void showBookmarkImportExportDialog(AppCompatActivity appCompatActivity,
-            boolean isImport, boolean isSuccess, String exportFilePath) {
+    public static void showBookmarkImportExportDialog(
+            AppCompatActivity appCompatActivity,
+            boolean isImport,
+            boolean isSuccess,
+            String exportFilePath) {
         try {
             BraveBookmarkImportExportDialogFragment dialogFragment =
                     BraveBookmarkImportExportDialogFragment.newInstance(