Skip to content

Commit bf84b94

Browse files
mkarolinmkarolin
authored
Merge pull request #6554 from brave/cr87
Upgrade from Chromium 86 to Chromium 87.
2 parents 5598e05 + 030742a commit bf84b94

File tree

487 files changed

+6232
-2316
lines changed

Some content is hidden

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

487 files changed

+6232
-2316
lines changed

‎android/brave_java_resources.gni

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,12 @@ brave_java_resources = [
690690
"java/res/layout/binance_spinner_dropdown_item.xml",
691691
"java/res/layout/binance_spinner_item.xml",
692692
"java/res/layout/binance_summary_item.xml",
693+
"java/res/layout/bottom_control_container.xml",
694+
"java/res/layout/bottom_toolbar.xml",
695+
"java/res/layout/bottom_toolbar_browsing.xml",
696+
"java/res/layout/bottom_toolbar_menu_button.xml",
697+
"java/res/layout/bottom_toolbar_tab_switcher.xml",
698+
"java/res/layout/icon_row_menu_footer.xml",
693699
"java/res/layout/brave_ads_existing_user_dialog_layout.xml",
694700
"java/res/layout/brave_ads_new_user_dialog_layout.xml",
695701
"java/res/layout/brave_bookmark_toolbar.xml",
@@ -756,6 +762,7 @@ brave_java_resources = [
756762
"java/res/layout/ntp_widget_list_item_layout.xml",
757763
"java/res/layout/qa_code_check.xml",
758764
"java/res/layout/report_broken_site_layout.xml",
765+
"java/res/layout/toolbar_space.xml",
759766
"java/res/layout/top_sites_layout.xml",
760767
"java/res/layout/tracker_item_layout.xml",
761768
"java/res/layout/user_wallet_activity.xml",

‎android/brave_java_sources.gni

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import("//brave/components/safetynet/java_sources.gni")
1212
import("//components/feed/features.gni")
1313

1414
brave_java_sources = [
15+
"../../brave/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java",
1516
"../../brave/android/java/org/chromium/chrome/browser/BraveAppHooks.java",
1617
"../../brave/android/java/org/chromium/chrome/browser/BraveBadge.java",
1718
"../../brave/android/java/org/chromium/chrome/browser/BraveFeatureList.java",
@@ -142,17 +143,37 @@ brave_java_sources = [
142143
"../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
143144
"../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
144145
"../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
146+
"../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java",
145147
"../../brave/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java",
146148
"../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java",
149+
"../../brave/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java",
147150
"../../brave/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java",
148151
"../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java",
152+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java",
149153
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java",
150-
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java",
151-
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java",
152-
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java",
153-
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java",
154-
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java",
154+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java",
155+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java",
156+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java",
157+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java",
158+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java",
159+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java",
160+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java",
161+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java",
162+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java",
163+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java",
164+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java",
165+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java",
166+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java",
167+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java",
168+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java",
169+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java",
170+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java",
171+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java",
172+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java",
173+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java",
174+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java",
155175
"../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java",
176+
"../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java",
156177
"../../brave/android/java/org/chromium/chrome/browser/ui/brave_tricks/checkbox_to_switch/CheckBoxPreference.java",
157178
"../../brave/android/java/org/chromium/chrome/browser/ui/messages/infobar/BraveSimpleConfirmInfoBarBuilder.java",
158179
"../../brave/android/java/org/chromium/chrome/browser/upgrade/BravePackageReplacedBroadcastReceiver.java",
@@ -180,7 +201,6 @@ brave_java_sources = [
180201
"../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/ConvertAsset.java",
181202
"../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/CryptoWidgetBottomSheetDialogFragment.java",
182203
"../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/CryptoWidgetTabAdapter.java",
183-
"../../brave/android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java",
184204
]
185205

186206
if (brave_rewards_enabled || enable_brave_referrals) {
@@ -191,10 +211,6 @@ if (brave_ads_enabled) {
191211
brave_java_sources += brave_ads_java_sources
192212
}
193213

194-
if (enable_feed_in_chrome) {
195-
brave_java_sources += [ "//brave/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java" ]
196-
}
197-
198214
if (enable_brave_sync) {
199215
brave_java_sources += [
200216
"../../brave/android/java/org/chromium/chrome/browser/BraveSyncInformers.java",
@@ -206,5 +222,7 @@ if (enable_brave_sync) {
206222

207223
brave_components_browser_ui_site_settings_android_java = [ "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java" ]
208224

225+
brave_browser_ui_android_appmenu_internal_sources = [ "//brave/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java" ]
226+
209227
brave_java_base_sources =
210228
[ "//brave/android/java/org/chromium/base/BraveCommandLineInitUtil.java" ]

‎android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.chromium.base.ApiCompatibilityUtils;
1616
import org.chromium.base.supplier.Supplier;
1717
import org.chromium.chrome.R;
18-
import org.chromium.chrome.browser.feed.action.FeedActionHandler;
1918
import org.chromium.chrome.browser.feed.library.api.host.action.ActionApi;
2019
import org.chromium.chrome.browser.feed.shared.FeedSurfaceDelegate;
2120
import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
@@ -37,13 +36,13 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
3736
public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager,
3837
TabModelSelector tabModelSelector, Supplier<Tab> tabProvider,
3938
@Nullable SnapScrollHelper snapScrollHelper, @Nullable View ntpHeader,
40-
@Nullable SectionHeaderView sectionHeaderView, FeedActionHandler.Options actionOptions,
39+
@Nullable SectionHeaderView sectionHeaderView, FeedV1ActionOptions actionOptions,
4140
boolean showDarkBackground, FeedSurfaceDelegate delegate,
4241
@Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile,
43-
boolean isPlaceholderShown, BottomSheetController bottomSheetController) {
42+
boolean isPlaceholderRequested, BottomSheetController bottomSheetController) {
4443
super(activity, snackbarManager, tabModelSelector, tabProvider, snapScrollHelper, ntpHeader,
4544
sectionHeaderView, actionOptions, showDarkBackground, delegate,
46-
pageNavigationDelegate, profile, isPlaceholderShown, bottomSheetController);
45+
pageNavigationDelegate, profile, isPlaceholderRequested, bottomSheetController);
4746
}
4847

4948
@Override

‎android/java/apk_for_test.flags

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,54 @@
7373
-keep class org.chromium.base.CommandLineInitUtil {
7474
*** initCommandLine(...);
7575
}
76+
77+
-keep class org.chromium.chrome.browser.ui.appmenu.AppMenu {
78+
*** getPopupPosition(...);
79+
}
80+
81+
-keep class org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator {
82+
*** mMediator;
83+
}
84+
85+
-keep class org.chromium.chrome.browser.toolbar.ToolbarManager {
86+
*** mBottomControlsCoordinator;
87+
*** mBrowserControlsSizer;
88+
*** mFullscreenManager;
89+
*** mActivityTabProvider;
90+
*** mAppThemeColorProvider;
91+
*** mShareDelegateSupplier;
92+
*** mScrimCoordinator;
93+
*** mActivity;
94+
*** mShowStartSurfaceSupplier;
95+
*** mOverviewModeBehaviorSupplier;
96+
*** mMenuButtonCoordinator;
97+
*** mToolbarTabController;
98+
*** mLocationBar;
99+
*** mActionModeController;
100+
*** mLocationBarModel;
101+
*** mToolbar;
102+
*** mBookmarkBridgeSupplier;
103+
*** onOrientationChange(...);
104+
*** updateButtonStatus(...);
105+
*** updateBookmarkButtonStatus(...);
106+
*** updateReloadState(...);
107+
}
108+
109+
-keep class org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator {
110+
*** mTabSwitcherModeCoordinatorPhone;
111+
*** mOptionalButtonController;
112+
}
113+
114+
-keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTTCoordinatorPhone {
115+
*** mTabSwitcherModeToolbar;
116+
}
117+
118+
-keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTTPhone {
119+
*** mNewTabViewButton;
120+
*** mNewTabImageButton;
121+
*** mToggleTabStackButton;
122+
*** mMenuButton;
123+
*** mShouldShowNewTabVariation;
124+
*** updateNewTabButtonVisibility(...);
125+
*** shouldShowIncognitoToggle(...);
126+
}

‎android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import androidx.appcompat.content.res.AppCompatResources;
1616

1717
import org.chromium.base.supplier.ObservableSupplier;
18+
import org.chromium.base.supplier.OneshotSupplier;
1819
import org.chromium.chrome.R;
1920
import org.chromium.chrome.browser.ActivityTabProvider;
2021
import org.chromium.chrome.browser.BraveFeatureList;
@@ -29,6 +30,7 @@
2930
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
3031
import org.chromium.chrome.browser.toolbar.ToolbarManager;
3132
import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
33+
import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator;
3234
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
3335
import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
3436

@@ -40,7 +42,7 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
4042
MultiWindowModeStateDispatcher multiWindowModeStateDispatcher,
4143
TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
4244
AppMenuDelegate appMenuDelegate,
43-
@Nullable ObservableSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
45+
OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
4446
ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier) {
4547
super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
4648
toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier,
@@ -58,6 +60,11 @@ public void prepareMenu(Menu menu, AppMenuHandler handler) {
5860
// and removed when menu is dismissed.
5961
if (!shouldShowPageMenu()) return;
6062

63+
if (isMenuButtonInBottomToolbar()) {
64+
// Do not show icon row on top when menu itself is on bottom
65+
menu.findItem(R.id.icon_row_menu_id).setVisible(false).setEnabled(false);
66+
}
67+
6168
// Brave donesn't show help menu item in app menu.
6269
menu.findItem(R.id.help_id).setVisible(false).setEnabled(false);
6370

@@ -126,4 +133,28 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
126133
shareButton.setContentDescription(mContext.getString(R.string.share));
127134
}
128135
}
136+
137+
@Override
138+
public boolean shouldShowHeader(int maxMenuHeight) {
139+
if (isMenuButtonInBottomToolbar()) return false;
140+
return super.shouldShowHeader(maxMenuHeight);
141+
}
142+
143+
@Override
144+
public boolean shouldShowFooter(int maxMenuHeight) {
145+
if (isMenuButtonInBottomToolbar()) return true;
146+
return super.shouldShowFooter(maxMenuHeight);
147+
}
148+
149+
@Override
150+
public int getFooterResourceId() {
151+
if (isMenuButtonInBottomToolbar()) {
152+
return shouldShowPageMenu() ? R.layout.icon_row_menu_footer : 0;
153+
}
154+
return super.getFooterResourceId();
155+
}
156+
157+
private boolean isMenuButtonInBottomToolbar() {
158+
return BraveMenuButtonCoordinator.isMenuFromBottom();
159+
}
129160
}

‎android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
1414
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
1515
import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator;
16-
import org.chromium.chrome.browser.feed.FeedProcessScopeFactory;
16+
import org.chromium.chrome.browser.feed.shared.FeedFeatures;
1717
import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider;
1818
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
1919
import org.chromium.chrome.browser.profiles.Profile;
@@ -52,7 +52,7 @@ protected void initializeMainView(Activity activity, Supplier<Tab> tabProvider,
5252
// Override surface provider
5353
Profile profile = Profile.fromWebContents(mTab.getWebContents());
5454

55-
assert !FeedProcessScopeFactory.isFeedProcessEnabled();
55+
assert !FeedFeatures.isFeedEnabled();
5656
mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager,
5757
tabModelSelector, tabProvider,
5858
new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout,

‎android/java/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
import org.chromium.base.supplier.Supplier;
1313
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
14+
import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost;
1415
import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate;
15-
import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionHost;
1616
import org.chromium.chrome.browser.share.ShareDelegate;
1717
import org.chromium.chrome.browser.tab.Tab;
1818
import org.chromium.chrome.browser.ui.favicon.LargeIconBridge;

‎android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import android.content.SharedPreferences;
1111
import android.os.Bundle;
12+
1213
import androidx.preference.Preference;
1314

1415
import org.chromium.base.ContextUtils;
@@ -20,10 +21,11 @@
2021
import org.chromium.chrome.browser.flags.ChromeFeatureList;
2122
import org.chromium.chrome.browser.night_mode.NightModeUtils;
2223
import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
24+
import org.chromium.chrome.browser.settings.BravePreferenceFragment;
2325
import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
26+
import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator;
2427
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
2528
import org.chromium.components.browser_ui.settings.SettingsUtils;
26-
import org.chromium.chrome.browser.settings.BravePreferenceFragment;
2729
import org.chromium.ui.base.DeviceFormFactor;
2830

2931
public class AppearancePreferences extends BravePreferenceFragment
@@ -120,6 +122,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
120122
.putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY,
121123
!originalStatus)
122124
.apply();
125+
BraveMenuButtonCoordinator.setMenuFromBottom(!originalStatus);
123126
BraveRelaunchUtils.askForRelaunch(getActivity());
124127
} else if (PREF_HIDE_BRAVE_REWARDS_ICON.equals(key)) {
125128
SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();

‎android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.chromium.chrome.browser.signin;
77

88
import org.chromium.base.annotations.CalledByNative;
9+
import org.chromium.chrome.browser.AppHooks;
910
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
1011
import org.chromium.chrome.browser.sync.AndroidSyncSettings;
1112
import org.chromium.components.signin.AccountTrackerService;
@@ -40,6 +41,6 @@ private static SigninManager create(long nativeSigninManagerAndroid,
4041
assert identityMutator != null;
4142
return new BraveSigninManager(nativeSigninManagerAndroid, accountTrackerService,
4243
identityManager, identityMutator,
43-
AndroidSyncSettings.get(), ExternalAuthUtils.getInstance());
44+
AndroidSyncSettings.get(), AppHooks.get().getExternalAuthUtils());
4445
}
4546
}

‎android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java renamed to ‎android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,26 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
44
* You can obtain one at http://mozilla.org/MPL/2.0/. */
55

6-
package org.chromium.chrome.browser.widget.tile;
6+
package org.chromium.chrome.browser.suggestions.tile;
77

88
import android.content.Context;
9+
import android.graphics.drawable.Drawable;
910
import android.util.AttributeSet;
1011
import android.widget.TextView;
1112

1213
import org.chromium.chrome.R;
1314
import org.chromium.chrome.browser.BraveRewardsHelper;
1415
import org.chromium.chrome.browser.ChromeTabbedActivity;
16+
import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
17+
import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
1518
import org.chromium.chrome.browser.preferences.BravePref;
16-
import org.chromium.components.user_prefs.UserPrefs;
1719
import org.chromium.chrome.browser.profiles.Profile;
18-
import org.chromium.chrome.browser.suggestions.tile.TileWithTextView;
20+
import org.chromium.chrome.browser.suggestions.tile.TileView;
1921
import org.chromium.chrome.browser.tabmodel.TabModel;
20-
import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
21-
import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
22+
import org.chromium.components.user_prefs.UserPrefs;
2223

23-
public class BraveTileWithTextView extends TileWithTextView {
24-
public BraveTileWithTextView(Context context, AttributeSet attrs) {
24+
public class BraveTileView extends TileView {
25+
public BraveTileView(Context context, AttributeSet attrs) {
2526
super(context, attrs);
2627
}
2728

‎android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55

66
package org.chromium.chrome.browser.sync;
77

8+
import android.accounts.Account;
9+
810
import org.chromium.chrome.browser.sync.ProfileSyncService;
9-
import org.chromium.components.sync.SyncContentResolverDelegate;
1011

1112
// see org.brave.bytecode.BraveAndroidSyncSettingsAdapter
1213
public class BraveAndroidSyncSettings extends AndroidSyncSettings {
1314
private boolean mMasterSyncEnabled;
1415

15-
public BraveAndroidSyncSettings(SyncContentResolverDelegate syncContentResolverDelegate) {
16-
super(syncContentResolverDelegate);
16+
public BraveAndroidSyncSettings(Account account) {
17+
super(account);
1718
}
1819

1920
// Chromium's AndroidSyncSettings.mChromeSyncEnabled is never set to true

0 commit comments

Comments
 (0)