Merge pull request #13331 from brave/cr103

brave · Jun 13, 2022 · 7749d27 · 7749d27
1 parent c008317
commit 7749d27
Show file tree

Hide file tree

Showing 460 changed files with 2,287 additions and 1,921 deletions.
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
@@ -286,6 +286,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesPreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java",
   "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java",
@@ -294,7 +295,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveIncognitoToggleTabLayout.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java",
@@ -307,7 +307,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java",
@@ -388,6 +387,7 @@ brave_browser_ui_android_appmenu_internal_sources = [
 
 brave_browser_ui_android_toolbar_sources = [
   "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java",
+  "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BottomTabSwitcherActionMenuCoordinator.java",
   "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java",
 ]
 

diff --git a/...java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java b/...java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java
@@ -18,8 +18,8 @@
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
-import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
@@ -54,13 +54,13 @@ public BraveTabGroupUiCoordinator(@NonNull Activity activity, @NonNull ViewGroup
             @NonNull Supplier<DynamicResourceLoader> dynamicResourceLoaderSupplier,
             @NonNull TabCreatorManager tabCreatorManager,
             @NonNull Supplier<ShareDelegate> shareDelegateSupplier,
-            @NonNull OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
+            @NonNull OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier,
             @NonNull SnackbarManager snackbarManager) {
         super(activity, parentView, incognitoStateProvider, scrimCoordinator,
                 omniboxFocusStateSupplier, bottomSheetController, activityLifecycleDispatcher,
                 isWarmOnResumeSupplier, tabModelSelector, tabContentManager, rootView,
                 dynamicResourceLoaderSupplier, tabCreatorManager, shareDelegateSupplier,
-                overviewModeBehaviorSupplier, snackbarManager);
+                layoutStateProviderSupplier, snackbarManager);
 
         mIncognitoStateProvider = incognitoStateProvider;
 

diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java
@@ -31,6 +31,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.top.Toolbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.SurfaceType;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.WindowAndroid;
@@ -52,17 +53,17 @@ public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarMa
             @Nullable ScrollableContainerDelegate externalScrollableContainerDelegate,
             @NewTabPageLaunchOrigin int launchOrigin,
             PrivacyPreferencesManagerImpl privacyPreferencesManager,
-            @NonNull Supplier<Toolbar> toolbarSupplier,
-            FeedLaunchReliabilityLoggingState launchReliabilityLoggingState,
-            @Nullable FeedSwipeRefreshLayout swipeRefreshLayout, boolean overScrollDisabled,
-            @Nullable ViewGroup viewportView, FeedActionDelegate actionDelegate,
-            HelpAndFeedbackLauncher helpAndFeedbackLauncher) {
+            @NonNull Supplier<Toolbar> toolbarSupplier, @SurfaceType int surfaceType,
+            long embeddingSurfaceCreatedTimeNs, @Nullable FeedSwipeRefreshLayout swipeRefreshLayout,
+            boolean overScrollDisabled, @Nullable ViewGroup viewportView,
+            FeedActionDelegate actionDelegate, HelpAndFeedbackLauncher helpAndFeedbackLauncher,
+            TabModelSelector tabModelSelector) {
         super(activity, snackbarManager, windowAndroid, snapScrollHelper, ntpHeader, toolbarHeight,
                 showDarkBackground, delegate, profile, isPlaceholderShownInitially,
                 bottomSheetController, shareDelegateSupplier, externalScrollableContainerDelegate,
-                launchOrigin, privacyPreferencesManager, toolbarSupplier,
-                launchReliabilityLoggingState, swipeRefreshLayout, overScrollDisabled, viewportView,
-                actionDelegate, helpAndFeedbackLauncher);
+                launchOrigin, privacyPreferencesManager, toolbarSupplier, surfaceType,
+                embeddingSurfaceCreatedTimeNs, swipeRefreshLayout, overScrollDisabled, viewportView,
+                actionDelegate, helpAndFeedbackLauncher, tabModelSelector);
     }
 
     public void createScrollViewForPolicy() {
@@ -98,8 +99,4 @@ public void createScrollViewForPolicy() {
     public NestedScrollView getScrollViewForPolicy() {
         return mScrollViewForPolicy;
     }
-
-    public boolean isReliabilityLoggingEnabled() {
-        return false;
-    }
 }
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -36,9 +36,17 @@
 }
 
 -keep class org.chromium.chrome.browser.ntp.NewTabPageLayout {
+    *** mMvTilesContainerLayout;
     *** insertSiteSectionView(...);
-    *** mSiteSectionView;
-    *** mTileGroup;
+}
+
+-keep class org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesMediator {
+    public <init>(...);
+    *** updateTileGridPlaceholderVisibility(...);
+}
+
+-keep class org.chromium.chrome.browser.suggestions.tile.BraveMostVisitedTilesMediator {
+    public <init>(...);
     *** updateTileGridPlaceholderVisibility(...);
 }
 
@@ -48,6 +56,7 @@
     *** mNewTabPageLayout;
     *** mFeedSurfaceProvider;
     *** mToolbarSupplier;
+    *** mTabModelSelector;
     *** updateSearchProviderHasLogo(...);
 }
 
@@ -69,6 +78,7 @@
     *** mSyncEncryption;
     *** mReviewSyncData;
     *** mSyncPaymentsIntegration;
+    *** mSyncReadingList;
     *** mTurnOffSync;
 }
 
@@ -129,7 +139,6 @@
     *** mIsWarmOnResumeSupplier;
     *** mTabContentManager;
     *** mTabCreatorManager;
-    *** mOverviewModeBehaviorSupplier;
     *** mSnackbarManager;
     *** onOrientationChange(...);
     *** updateBookmarkButtonStatus(...);
@@ -195,8 +204,7 @@
 }
 
 -keep class org.chromium.chrome.browser.bookmarks.BookmarkUtils {
-    *** showBookmarkBottomSheet(...);
-    *** addBookmarkAndShowSnackbar(...);
+    *** addOrEditBookmark(...);
 }
 
 -keep class org.chromium.chrome.browser.toolbar.BraveToolbarManager {
@@ -326,14 +334,12 @@
     *** mActivity;
     *** mNtpHeader;
     *** mRootView;
-    *** isReliabilityLoggingEnabled(...);
 }
 
 -keep class org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator {
     *** mScrollViewForPolicy;
     *** mNtpHeader;
     *** mRootView;
-    *** isReliabilityLoggingEnabled(...);
 }
 
 -keep class org.chromium.chrome.browser.feed.FeedSurfaceMediator {
@@ -471,3 +477,7 @@
     public <init>(...);
     *** createManageDevicesLink(...);
 }
+
+-keep class org.chromium.chrome.browser.ChromeApplicationImpl
+
+-keep class org.chromium.chrome.browser.BraveApplicationImplBase
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -1438,7 +1438,7 @@ public ObservableSupplier<BrowserControlsManager> getBrowserControlsManagerSuppl
     }
 
     public int getToolbarShadowHeight() {
-        View toolbarShadow = findViewById(R.id.toolbar_shadow);
+        View toolbarShadow = findViewById(R.id.toolbar_hairline);
         assert toolbarShadow != null;
         if (toolbarShadow != null) {
             return toolbarShadow.getHeight();
@@ -1447,7 +1447,7 @@ public int getToolbarShadowHeight() {
     }
 
     public int getToolbarBottom() {
-        View toolbarShadow = findViewById(R.id.toolbar_shadow);
+        View toolbarShadow = findViewById(R.id.toolbar_hairline);
         assert toolbarShadow != null;
         if (toolbarShadow != null) {
             return toolbarShadow.getBottom();

diff --git a/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java b/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java
@@ -18,8 +18,8 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
-import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge;
+import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
@@ -36,11 +36,11 @@ public BraveAppMenuPropertiesDelegateImpl(Context context,
             ActivityTabProvider activityTabProvider,
             MultiWindowModeStateDispatcher multiWindowModeStateDispatcher,
             TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
-            @Nullable OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
+            @Nullable OneshotSupplier<LayoutStateProvider> layoutStateProvidersSupplier,
             @Nullable OneshotSupplier<StartSurface> startSurfaceSupplier,
             ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier) {
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
-                toolbarManager, decorView, overviewModeBehaviorSupplier, startSurfaceSupplier,
+                toolbarManager, decorView, layoutStateProvidersSupplier, startSurfaceSupplier,
                 bookmarkBridgeSupplier);
     }
 

diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
@@ -23,10 +23,10 @@
 import org.chromium.chrome.browser.BraveFeatureList;
 import org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
-import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge;
 import org.chromium.chrome.browser.feed.webfeed.WebFeedSnackbarController;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.set_default_browser.BraveSetDefaultBrowserUtils;
@@ -55,13 +55,13 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
             MultiWindowModeStateDispatcher multiWindowModeStateDispatcher,
             TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
             AppMenuDelegate appMenuDelegate,
-            OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
+            OneshotSupplier<LayoutStateProvider> layoutStateProvider,
             OneshotSupplier<StartSurface> startSurfaceSupplier,
             ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
             WebFeedSnackbarController.FeedLauncher feedLauncher,
             ModalDialogManager modalDialogManager, SnackbarManager snackbarManager) {
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
-                toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier,
+                toolbarManager, decorView, appMenuDelegate, layoutStateProvider,
                 startSurfaceSupplier, bookmarkBridgeSupplier, feedLauncher, modalDialogManager,
                 snackbarManager);
 

diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java
@@ -31,25 +31,11 @@
  * A class holding static util functions for bookmark.
  */
 public class BraveBookmarkUtils extends BookmarkUtils {
-    private static final String TAG = "BraveBookmarkUtils";
-    /**
-     * If the tab has already been bookmarked, start {@link BookmarkEditActivity} for the
-     * normal bookmark or show the reading list page for reading list bookmark.
-     * If not, add the bookmark to {@link BookmarkModel}, and show a snackbar notifying the user.
-     *
-     * @param existingBookmarkItem The {@link BookmarkItem} if the tab has already been bookmarked.
-     * @param bookmarkModel The bookmark model.
-     * @param tab The tab to add or edit a bookmark.
-     * @param snackbarManager The {@link SnackbarManager} used to show the snackbar.
-     * @param bottomSheetController The {@link BottomSheetController} used to show the bottom sheet.
-     * @param activity Current activity.
-     * @param fromCustomTab boolean indicates whether it is called by Custom Tab.
-     * @param callback Invoked with the resulting bookmark ID, which could be null if unsuccessful.
-     */
     public static void addOrEditBookmark(@Nullable BookmarkItem existingBookmarkItem,
             BookmarkModel bookmarkModel, Tab tab, SnackbarManager snackbarManager,
             BottomSheetController bottomSheetController, Activity activity, boolean fromCustomTab,
-            Callback<BookmarkId> callback) {
+            @BookmarkType int bookmarkType, Callback<BookmarkId> callback,
+            boolean fromExplicitTrackUi) {
         assert bookmarkModel.isBookmarkModelLoaded();
         if (existingBookmarkItem != null) {
             if (snackbarManager.isShowing()) {
@@ -61,28 +47,8 @@ public static void addOrEditBookmark(@Nullable BookmarkItem existingBookmarkItem
             return;
         }
 
-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.READ_LATER)) {
-            // Show a bottom sheet to let the user select target bookmark folder.
-            showBookmarkBottomSheet(bookmarkModel, tab, snackbarManager, bottomSheetController,
-                    activity, fromCustomTab, callback);
-            return;
-        }
-
-        BookmarkId newBookmarkId = addBookmarkAndShowSnackbar(
-                bookmarkModel, tab, snackbarManager, activity, fromCustomTab);
-        callback.onResult(newBookmarkId);
-    }
-
-    protected static void showBookmarkBottomSheet(BookmarkModel bookmarkModel, Tab tab,
-            SnackbarManager snackbarManager, BottomSheetController bottomSheetController,
-            Activity activity, boolean fromCustomTab, Callback<BookmarkId> callback) {
-        assert (false);
-    }
-
-    // The legacy code path to add or edit bookmark without triggering the bookmark bottom sheet.
-    protected static BookmarkId addBookmarkAndShowSnackbar(BookmarkModel bookmarkModel, Tab tab,
-            SnackbarManager snackbarManager, Activity activity, boolean fromCustomTab) {
-        assert (false);
-        return null;
+        BookmarkUtils.addOrEditBookmark(existingBookmarkItem, bookmarkModel, tab, snackbarManager,
+                bottomSheetController, activity, fromCustomTab, bookmarkType, callback,
+                fromExplicitTrackUi);
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java b/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java
@@ -4,12 +4,15 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.chromium.chrome.browser.firstrun;
-
 import android.app.Activity;
 
+import org.chromium.base.supplier.OneshotSupplier;
+import org.chromium.components.signin.AccountManagerFacadeProvider;
+
 public abstract class BraveFirstRunFlowSequencer extends FirstRunFlowSequencer {
     public BraveFirstRunFlowSequencer(Activity activity) {
-        super(activity);
+        super(activity,
+                new ChildAccountStatusSupplier(AccountManagerFacadeProvider.getInstance(), null));
     }
 
     @Override

diff --git a/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java
@@ -29,6 +29,7 @@
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
+import org.chromium.chrome.browser.firstrun.BraveFirstRunFlowSequencer;
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
@@ -44,7 +45,7 @@ public class P3aOnboardingActivity extends FirstRunActivityBase {
     private boolean mInitializeViewsDone;
     private boolean mInvokePostWorkAtInitializeViews;
     private boolean mIsP3aEnabled;
-    private FirstRunFlowSequencer mFirstRunFlowSequencer;
+    private BraveFirstRunFlowSequencer mFirstRunFlowSequencer;
     private CheckBox mP3aOnboardingCheckbox;
     private Button mBtnContinue;
 
@@ -168,8 +169,8 @@ public void finishNativeInitialization() {
     public void onBackPressed() {}
 
     @Override
-    protected void triggerLayoutInflation() {
-        mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
+    public void triggerLayoutInflation() {
+        mFirstRunFlowSequencer = new BraveFirstRunFlowSequencer(this) {
             @Override
             public void onFlowIsKnown(Bundle freProperties) {
                 initializeViews();