Skip to content

Commit 1438bdf

Browse files
mkarolinmkarolin
committed
Merge pull request #27522 from brave/cr135
Upgrade from Chromium 134 to Chromium 135
1 parent 8bc5b41 commit 1438bdf

File tree

825 files changed

+11131
-3363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

825 files changed

+11131
-3363
lines changed

‎android/brave_java_resources.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -972,8 +972,8 @@ brave_java_resources = [
972972
"java/res/values/brave_ids.xml",
973973
"java/res/values/brave_styles.xml",
974974
"java/res/values/shimmer_attrs.xml",
975-
"java/res/xml/appearance_preferences.xml",
976975
"java/res/xml/background_images_preferences.xml",
976+
"java/res/xml/brave_appearance_preferences.xml",
977977
"java/res/xml/brave_download_preferences.xml",
978978
"java/res/xml/brave_ethereum_preferences.xml",
979979
"java/res/xml/brave_leo_default_model_preferences.xml",

‎android/brave_java_sources.gni

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import("//brave/android/feed/brave_feed_java_sources.gni")
88
import("//brave/android/java/org/chromium/chrome/browser/billing/sources.gni")
99
import("//brave/android/java/org/chromium/chrome/browser/playlist/sources.gni")
1010
import("//brave/base/brave_base_shared_preferences_java.gni")
11+
import("//brave/browser/bookmarks/android/sources.gni")
1112
import("//brave/browser/brave_ads/android/java_sources.gni")
1213
import("//brave/browser/hub/internal/android/java/java_sources.gni")
1314
import("//brave/browser/incognito/android/java_sources.gni")
@@ -65,15 +66,12 @@ brave_java_sources = [
6566
"../../brave/android/java/org/chromium/chrome/browser/autofill/BraveAutofillBackgroundServiceImpl.java",
6667
"../../brave/android/java/org/chromium/chrome/browser/autofill/BraveAutofillService.java",
6768
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.java",
68-
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkDelegate.java",
6969
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkImportExportDialogFragment.java",
7070
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java",
7171
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java",
72-
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkModel.java",
7372
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java",
7473
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbar.java",
7574
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java",
76-
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUiPrefs.java",
7775
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java",
7876
"../../brave/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoMojomHelper.java",
7977
"../../brave/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoPlansActivity.java",
@@ -541,6 +539,7 @@ brave_java_base_sources = [
541539
"//brave/android/java/org/chromium/base/BraveFeatureList.java",
542540
"//brave/android/java/org/chromium/base/BravePreferenceKeys.java",
543541
"//brave/android/java/org/chromium/base/BraveReflectionUtil.java",
542+
"//brave/android/java/org/chromium/base/BraveUrlConstants.java",
544543
"//brave/android/java/org/chromium/base/Callbacks.java",
545544
]
546545

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

+78-5
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
</message>
336336

337337
<!-- Tab Grid Dialog strings -->
338-
<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.">
338+
<message name="IDS_REMOVE_TAB_FROM_GROUP" desc="Content description for an action which removes a tab from its group.">
339339
Remove from group
340340
</message>
341341
<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 @@
351351
Close group
352352
</message>
353353
<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.">
354-
Manage sharing
354+
Manage access
355355
</message>
356356
<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.">
357357
Recent activity
@@ -726,6 +726,45 @@
726726
other {Created <ph name="NUM_YEARS_MANY">%d<ex>2</ex></ph> years ago}
727727
}
728728
</message>
729+
<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.">
730+
Updated just now
731+
</message>
732+
<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.">
733+
{NUM_MINS, plural,
734+
=1 {Updated <ph name="NUM_MINS_ONE">%d<ex>1</ex></ph> minute ago}
735+
other {Updated <ph name="NUM_MINS_MANY">%d<ex>2</ex></ph> minutes ago}
736+
}
737+
</message>
738+
<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.">
739+
{NUM_HOURS, plural,
740+
=1 {Updated <ph name="NUM_HOURS_ONE">%d<ex>1</ex></ph> hour ago}
741+
other {Updated <ph name="NUM_HOURS_MANY">%d<ex>2</ex></ph> hours ago}
742+
}
743+
</message>
744+
<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.">
745+
{NUM_DAYS, plural,
746+
=1 {Updated <ph name="NUM_DAYS_ONE">%d<ex>1</ex></ph> day ago}
747+
other {Updated <ph name="NUM_DAYS_MANY">%d<ex>2</ex></ph> days ago}
748+
}
749+
</message>
750+
<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.">
751+
{NUM_WEEKS, plural,
752+
=1 {Updated <ph name="NUM_WEEKS_ONE">%d<ex>1</ex></ph> week ago}
753+
other {Updated <ph name="NUM_WEEKS_MANY">%d<ex>2</ex></ph> weeks ago}
754+
}
755+
</message>
756+
<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.">
757+
{NUM_MONTHS, plural,
758+
=1 {Updated <ph name="NUM_MONTHS_ONE">%d<ex>1</ex></ph> month ago}
759+
other {Updated <ph name="NUM_MONTHS_MANY">%d<ex>2</ex></ph> months ago}
760+
}
761+
</message>
762+
<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.">
763+
{NUM_MONTHS, plural,
764+
=1 {Updated <ph name="NUM_YEARS_ONE">%d<ex>1</ex></ph> year ago}
765+
other {Updated <ph name="NUM_YEARS_MANY">%d<ex>2</ex></ph> years ago}
766+
}
767+
</message>
729768
<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]">
730769
+<ph name="HIDDEN_TABS_COUNT">%1$s<ex>3</ex></ph>
731770
</message>
@@ -989,12 +1028,46 @@ If you delete it, everyone will immediately lose access to the "<ph name="TITLE_
9891028
</message>
9901029

9911030
<!-- Tab Group Removed Message Strings -->
992-
<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]">
993-
<ph name="TAB_GROUP_NAME">%1$s<ex>Vacation</ex></ph> tab group no longer available
994-
</message>
1031+
<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]">
1032+
"<ph name="TAB_GROUP_NAME">%1$s<ex>Vacation</ex></ph>" tab group no longer available
1033+
</message>
1034+
<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]">
1035+
"<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
1036+
</message>
1037+
<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]">
1038+
{TAB_GROUPS_COUNT, plural,
1039+
=1 {<ph name="TAB_GROUPS_COUNT_ONE">%1$d<ex>1</ex></ph> tab group no longer available}
1040+
other {<ph name="TAB_GROUPS_COUNT_MANY">%1$d<ex>5</ex></ph> tab groups no longer available}
1041+
}
1042+
</message>
9951043
<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">
9961044
Dismiss the card.
9971045
</message>
1046+
1047+
<!-- Tab context menu (for individual tabs) -->
1048+
<message name="IDS_ADD_TAB_TO_GROUP" desc="Content description for an action which adds a tab to a group.">
1049+
Add to group
1050+
</message>
1051+
1052+
<!-- Tab Group List Bottom Sheet -->
1053+
<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.">
1054+
Add to
1055+
</message>
1056+
<message name="IDS_CREATE_NEW_GROUP_ROW_TITLE" desc="Description text for an option in a bottom sheet to create a new tab group.">
1057+
New tab group
1058+
</message>
1059+
<message name="IDS_TAB_GROUP_LIST_BOTTOM_SHEET_CONTENT_DESCRIPTION" desc="The content description for the bottom sheet containing a list of tab groups.">
1060+
Select tab group
1061+
</message>
1062+
<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.">
1063+
Tab group list, opened at half height
1064+
</message>
1065+
<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.">
1066+
Tab group list, opened at full height
1067+
</message>
1068+
<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.">
1069+
Tab group list closed
1070+
</message>
9981071
</messages>
9991072
</release>
10001073
</grit>

‎android/java/apk_for_test.flags

-8
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929

3030
-keep class org.chromium.chrome.browser.bookmarks.BookmarkBridge {
3131
*** mNativeBookmarkBridge;
32-
*** extensiveBookmarkChangesBeginning(...);
33-
*** extensiveBookmarkChangesEnded(...);
34-
*** createBookmarkItem(...);
3532
<init>(...);
3633
}
3734

@@ -202,7 +199,6 @@
202199

203200
-keep class org.chromium.chrome.browser.bookmarks.BookmarkUtils {
204201
*** addOrEditBookmark(...);
205-
*** showBookmarkManagerOnPhone(...);
206202
*** isSpecialFolder(...);
207203
}
208204

@@ -892,10 +888,6 @@
892888
public <init>(...);
893889
}
894890

895-
-keep class org.chromium.chrome.browser.undo_tab_close_snackbar.UndoBarController {
896-
*** showUndoBar(...);
897-
}
898-
899891
-keep class org.chromium.chrome.browser.tabbed_mode.TabbedNavigationBarColorController {
900892
*** mContext;
901893
*** mTabModelSelector;

‎components/embedder_support/android/java/src/org/chromium/components/embedder_support/util/BraveUrlConstants.java ‎android/java/org/chromium/base/BraveUrlConstants.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
44
* You can obtain one at https://mozilla.org/MPL/2.0/. */
55

6-
package org.chromium.components.embedder_support.util;
6+
package org.chromium.base;
77

8-
/**
9-
* Extension of UrlConstants.java
10-
*/
8+
/** Extension of UrlConstants.java */
119
public class BraveUrlConstants {
1210
public static final String BRAVE_SCHEME = "brave";
1311
}

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55

66
package org.chromium.chrome.browser;
77

8+
import org.chromium.base.Callback;
89
import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
910

1011
public class BraveAppHooks extends AppHooks {
12+
/** Async fetch the iterator of partner bookmarks (or null if not available). */
1113
@Override
12-
public PartnerBookmark.BookmarkIterator getPartnerBookmarkIterator() {
13-
return null;
14+
public void requestPartnerBookmarkIterator(
15+
Callback<PartnerBookmark.BookmarkIterator> callback) {
16+
callback.onResult(null);
1417
}
1518
}

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package org.chromium.chrome.browser;
77

8+
import androidx.annotation.NonNull;
9+
810
import org.chromium.chrome.browser.tab.Tab;
911
import org.chromium.chrome.browser.util.TabUtils;
1012
import org.chromium.ui.OverscrollAction;
@@ -18,8 +20,10 @@ public class BraveSwipeRefreshHandler extends SwipeRefreshHandler {
1820
public Tab mTab;
1921

2022
// There is a direct patch for SwipeRefreshHandler to make it's ctor public
21-
public BraveSwipeRefreshHandler(Tab tab) {
22-
super(tab);
23+
public BraveSwipeRefreshHandler(
24+
Tab tab,
25+
@NonNull SwipeRefreshHandler.SwipeRefreshLayoutCreator swipeRefreshLayoutCreator) {
26+
super(tab, swipeRefreshLayoutCreator);
2327
}
2428

2529
@Override

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

+6
Original file line numberDiff line numberDiff line change
@@ -2464,6 +2464,12 @@ public void addOrEditBookmark(final Tab tabToBookmark) {
24642464
((TabBookmarker) mTabBookmarkerSupplier.get()).addOrEditBookmark(tabToBookmark);
24652465
}
24662466

2467+
public void showBookmarkManager(Profile profile) {
2468+
if (mBookmarkManagerOpenerSupplier.get() != null) {
2469+
mBookmarkManagerOpenerSupplier.get().showBookmarkManager(this, profile);
2470+
}
2471+
}
2472+
24672473
// We call that method with an interval
24682474
// BraveSafeBrowsingApiHandler.SAFE_BROWSING_INIT_INTERVAL_MS,
24692475
// as upstream does, to keep the GmsCore process alive.

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import org.chromium.chrome.browser.bookmarks.BookmarkManagerCoordinator;
1212
import org.chromium.chrome.browser.bookmarks.BraveBookmarkManagerCoordinator;
13+
import org.chromium.chrome.browser.profiles.Profile;
1314
import org.chromium.ui.base.ActivityWindowAndroid;
1415
import org.chromium.ui.base.IntentRequestTracker;
1516

@@ -19,14 +20,14 @@ public class BraveBookmarkActivity extends BookmarkActivity {
1920
private ActivityWindowAndroid mWindowAndroid;
2021

2122
@Override
22-
protected void onCreate(Bundle savedInstanceState) {
23-
super.onCreate(savedInstanceState);
23+
protected void onProfileAvailable(Profile profile) {
24+
super.onProfileAvailable(profile);
2425

2526
IntentRequestTracker intentRequestTracker = IntentRequestTracker.createFromActivity(this);
2627
mWindowAndroid =
2728
new ActivityWindowAndroid(
2829
this, true, intentRequestTracker, null, /* trackOcclusion= */ false);
29-
mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState);
30+
3031
if (mBookmarkManagerCoordinator instanceof BraveBookmarkManagerCoordinator) {
3132
((BraveBookmarkManagerCoordinator) mBookmarkManagerCoordinator)
3233
.setWindow(mWindowAndroid);

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

+9-8
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.content.ComponentName;
99
import android.content.Context;
1010

11+
import androidx.annotation.NonNull;
1112
import androidx.annotation.Nullable;
1213

1314
import org.chromium.chrome.browser.profiles.Profile;
@@ -19,21 +20,21 @@ public class BraveBookmarkManagerCoordinator extends BookmarkManagerCoordinator
1920
private BookmarkManagerMediator mMediator;
2021

2122
public BraveBookmarkManagerCoordinator(
22-
Context context,
23-
ComponentName openBookmarkComponentName,
23+
@NonNull Context context,
2424
boolean isDialogUi,
25-
SnackbarManager snackbarManager,
26-
Profile profile,
27-
BookmarkUiPrefs bookmarkUiPrefs,
28-
@Nullable Runnable bookmarkOpenedCallback) {
25+
@NonNull SnackbarManager snackbarManager,
26+
@NonNull Profile profile,
27+
@NonNull BookmarkUiPrefs bookmarkUiPrefs,
28+
@NonNull BookmarkOpener bookmarkOpener,
29+
@Nullable ComponentName openBookmarkComponentName) {
2930
super(
3031
context,
31-
openBookmarkComponentName,
3232
isDialogUi,
3333
snackbarManager,
3434
profile,
3535
bookmarkUiPrefs,
36-
bookmarkOpenedCallback);
36+
bookmarkOpener,
37+
openBookmarkComponentName);
3738
}
3839

3940
public void setWindow(ActivityWindowAndroid window) {

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

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
import android.content.ComponentName;
99

10+
import androidx.annotation.NonNull;
11+
import androidx.annotation.Nullable;
12+
1013
import org.chromium.chrome.browser.app.BraveActivity;
1114
import org.chromium.chrome.browser.profiles.Profile;
1215
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -17,11 +20,12 @@ public class BraveBookmarkPage extends BookmarkPage {
1720
private BookmarkManagerCoordinator mBookmarkManagerCoordinator;
1821

1922
public BraveBookmarkPage(
20-
ComponentName componentName,
21-
SnackbarManager snackbarManager,
22-
Profile profile,
23-
NativePageHost host) {
24-
super(componentName, snackbarManager, profile, host);
23+
@NonNull SnackbarManager snackbarManager,
24+
@NonNull Profile profile,
25+
@NonNull NativePageHost host,
26+
@Nullable ComponentName componentName) {
27+
super(snackbarManager, profile, host, componentName);
28+
2529
if (mBookmarkManagerCoordinator instanceof BraveBookmarkManagerCoordinator
2630
&& BraveActivity.getChromeTabbedActivity() != null) {
2731
((BraveBookmarkManagerCoordinator) mBookmarkManagerCoordinator)

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

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.content.Context;
99

1010
import org.chromium.base.supplier.OneshotSupplier;
11+
import org.chromium.chrome.browser.profiles.Profile;
1112
import org.chromium.components.bookmarks.BookmarkId;
1213
import org.chromium.components.browser_ui.widget.dragreorder.DragReorderableRecyclerViewAdapter;
1314
import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
@@ -23,6 +24,7 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
2324

2425
BraveBookmarkToolbarCoordinator(
2526
Context context,
27+
Profile profile,
2628
SelectableListLayout<BookmarkId> selectableListLayout,
2729
SelectionDelegate<BookmarkId> selectionDelegate,
2830
SearchDelegate searchDelegate,
@@ -38,6 +40,7 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
3840
BooleanSupplier incognitoEnabledSupplier) {
3941
super(
4042
context,
43+
profile,
4144
selectableListLayout,
4245
selectionDelegate,
4346
searchDelegate,

0 commit comments

Comments
 (0)