Merge pull request #7408 from brave/cr88

Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
brave · Jan 12, 2021 · 9d9d662 · 9d9d662
1 parent 9f9885b
commit 9d9d662
Show file tree

Hide file tree

Showing 321 changed files with 2,182 additions and 1,994 deletions.
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -83,7 +83,8 @@
 }
 
 -keep class org.chromium.chrome.browser.toolbar.ToolbarManager {
-    *** mBottomControlsCoordinator;
+    *** mBottomControlsCoordinatorSupplier;
+    *** mCallbackController;
     *** mBrowserControlsSizer;
     *** mFullscreenManager;
     *** mActivityTabProvider;

diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -70,6 +70,7 @@
 import org.chromium.chrome.browser.settings.BraveRewardsPreferences;
 import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
 import org.chromium.chrome.browser.share.ShareDelegate;
+import org.chromium.chrome.browser.share.ShareDelegateImpl.ShareOrigin;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tab.TabLaunchType;
@@ -150,7 +151,7 @@ public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
         // Handle items replaced by Brave.
         if (id == R.id.info_menu_id && currentTab != null) {
             ShareDelegate shareDelegate = (ShareDelegate) getShareDelegateSupplier().get();
-            shareDelegate.share(currentTab, false);
+            shareDelegate.share(currentTab, false, ShareOrigin.OVERFLOW_MENU);
             return true;
         }
 
@@ -504,9 +505,8 @@ private void handleBraveSetDefaultBrowserDialog() {
                 View layout = inflater.inflate(R.layout.brave_set_default_browser_dialog,
                                                (ViewGroup) findViewById(R.id.brave_set_default_browser_toast_container));
 
-                Toast toast = new Toast(context);
+                Toast toast = new Toast(context, layout);
                 toast.setDuration(Toast.LENGTH_LONG);
-                toast.setView(layout);
                 toast.setGravity(Gravity.TOP, 0, 40);
                 toast.show();
                 Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(BRAVE_BLOG_URL));

diff --git a/...oid/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java b/...oid/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java
@@ -16,14 +16,14 @@
 
 @JNINamespace("chrome::android")
 public class BraveShieldsContentSettings {
-    static public final String RESOURCE_IDENTIFIER_ADS = "ads";
+    static public final String RESOURCE_IDENTIFIER_ADS = "shieldsAds";
     static public final String RESOURCE_IDENTIFIER_TRACKERS = "trackers";
     static public final String RESOURCE_IDENTIFIER_ADS_TRACKERS = "ads_trackers";
     static public final String RESOURCE_IDENTIFIER_DATA_SAVED = "data_saved";
     static public final String RESOURCE_IDENTIFIER_HTTP_UPGRADABLE_RESOURCES = "httpUpgradableResources";
     static public final String RESOURCE_IDENTIFIER_BRAVE_SHIELDS = "braveShields";
     static public final String RESOURCE_IDENTIFIER_FINGERPRINTING = "fingerprinting";
-    static public final String RESOURCE_IDENTIFIER_COOKIES = "cookies";
+    static public final String RESOURCE_IDENTIFIER_COOKIES = "shieldsCookies";
     static public final String RESOURCE_IDENTIFIER_REFERRERS = "referrers";
     static public final String RESOURCE_IDENTIFIER_JAVASCRIPTS = "javascript";
 

diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java
@@ -20,6 +20,7 @@
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareDelegate;
+import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 import org.chromium.chrome.features.start_surface.StartSurface;
@@ -37,12 +38,13 @@ public BraveTabbedRootUiCoordinator(ChromeActivity activity,
             Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
             ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
             OneshotSupplier<StartSurface> startSurfaceSupplier,
-            OneshotSupplier<LayoutStateProvider> layoutStateProviderOneshotSupplier) {
+            OneshotSupplier<LayoutStateProvider> layoutStateProviderOneshotSupplier,
+            Supplier<Tab> startSurfaceParentTabSupplier) {
         super(activity, onOmniboxFocusChangedListener, intentMetadataOneshotSupplier,
                 shareDelegateSupplier, tabProvider, ephemeralTabCoordinatorSupplier,
                 profileSupplier, bookmarkBridgeSupplier, overviewModeBehaviorSupplier,
                 contextualSearchManagerSupplier, tabModelSelectorSupplier, startSurfaceSupplier,
-                layoutStateProviderOneshotSupplier);
+                layoutStateProviderOneshotSupplier, startSurfaceParentTabSupplier);
     }
 
     @Override

diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -10,12 +10,15 @@
 import android.view.View.OnClickListener;
 import android.view.ViewStub;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
+import org.chromium.base.CallbackController;
 import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
@@ -25,7 +28,7 @@
 import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.compositor.Invalidator;
-import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
+import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
 import org.chromium.chrome.browser.findinpage.FindToolbarManager;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.homepage.HomepageManager;
@@ -64,7 +67,8 @@
 import java.util.List;
 
 public class BraveToolbarManager extends ToolbarManager {
-    private BottomControlsCoordinator mBottomControlsCoordinator;
+    private ObservableSupplierImpl<BottomControlsCoordinator> mBottomControlsCoordinatorSupplier;
+    private CallbackController mCallbackController;
     private BrowserControlsSizer mBrowserControlsSizer;
     private FullscreenManager mFullscreenManager;
     private ActivityTabProvider mActivityTabProvider;
@@ -110,7 +114,8 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
             Supplier<ModalDialogManager> modalDialogManagerSupplier,
             NightModeStateProvider nightModeStateProvider,
             StatusBarColorController statusBarColorController, AppMenuDelegate appMenuDelegate,
-            ActivityLifecycleDispatcher activityLifecycleDispatcher) {
+            ActivityLifecycleDispatcher activityLifecycleDispatcher,
+            @NonNull Supplier<Tab> startSurfaceParentTabSupplier) {
         super(activity, controlsSizer, fullscreenManager, controlContainer, compositorViewHolder,
                 urlFocusChangedCallback, themeColorProvider, tabObscuringHandler,
                 shareDelegateSupplier, identityDiscController, buttonDataProviders, tabProvider,
@@ -121,15 +126,18 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
                 intentMetadataOneshotSupplier, promoShownOneshotSupplier, windowAndroid,
                 isInOverviewModeSupplier, isCustomTab, modalDialogManagerSupplier,
                 nightModeStateProvider, statusBarColorController, appMenuDelegate,
-                activityLifecycleDispatcher);
+                activityLifecycleDispatcher, startSurfaceParentTabSupplier);
 
         mOmniboxFocusStateSupplier = omniboxFocusStateSupplier;
         mLayoutStateProviderSupplier = layoutStateProviderSupplier;
         mActivity = activity;
 
         mBraveHomepageStateListener = () -> {
-            assert (mBottomControlsCoordinator instanceof BraveBottomControlsCoordinator);
-            ((BraveBottomControlsCoordinator) mBottomControlsCoordinator).updateHomeButtonState();
+            assert (mBottomControlsCoordinatorSupplier != null);
+            assert (mBottomControlsCoordinatorSupplier.get()
+                            instanceof BraveBottomControlsCoordinator);
+            ((BraveBottomControlsCoordinator) mBottomControlsCoordinatorSupplier.get())
+                    .updateHomeButtonState();
         };
         HomepageManager.getInstance().addListener(mBraveHomepageStateListener);
     }
@@ -143,34 +151,33 @@ public void enableBottomControls() {
         }
         viewStub.setOnInflateListener((stub, inflated) -> { mRootBottomView = inflated; });
         assert (mActivity instanceof ChromeActivity);
-        mBottomControlsCoordinator =
-                new BraveBottomControlsCoordinator(mLayoutStateProviderSupplier,
-                        BottomTabSwitcherActionMenuCoordinator.createOnLongClickListener(
-                                id -> ((ChromeActivity) mActivity).onOptionsItemSelected(id, null)),
-                        mBrowserControlsSizer, mFullscreenManager,
-                        mActivity.findViewById(R.id.bottom_controls_stub), mActivityTabProvider,
-                        mAppThemeColorProvider, mShareDelegateSupplier,
-                        mMenuButtonCoordinator.getMenuButtonHelperSupplier(),
-                        mShowStartSurfaceSupplier, mToolbarTabController::openHomepage,
-                        (reason)
-                                -> setUrlBarFocus(true, reason),
-                        mScrimCoordinator, mOmniboxFocusStateSupplier);
-        ((BraveBottomControlsCoordinator) mBottomControlsCoordinator).setRootView(mRootBottomView);
+        mBottomControlsCoordinatorSupplier.set(new BraveBottomControlsCoordinator(
+                mLayoutStateProviderSupplier,
+                BottomTabSwitcherActionMenuCoordinator.createOnLongClickListener(
+                        id -> ((ChromeActivity) mActivity).onOptionsItemSelected(id, null)),
+                mActivityTabProvider, mBrowserControlsSizer, mFullscreenManager,
+                mActivity.findViewById(R.id.bottom_controls_stub), mAppThemeColorProvider,
+                mShareDelegateSupplier, mMenuButtonCoordinator.getMenuButtonHelperSupplier(),
+                mToolbarTabController::openHomepage,
+                mCallbackController.makeCancelable((reason) -> setUrlBarFocus(true, reason)),
+                mScrimCoordinator, mOmniboxFocusStateSupplier));
+        ((BraveBottomControlsCoordinator) mBottomControlsCoordinatorSupplier.get())
+                .setRootView(mRootBottomView);
         boolean isBottomToolbarVisible = BottomToolbarConfiguration.isBottomToolbarEnabled()
                 && mActivity.getResources().getConfiguration().orientation
                         != Configuration.ORIENTATION_LANDSCAPE;
         setBottomToolbarVisible(isBottomToolbarVisible);
     }
 
     @Override
-    public void initializeWithNative(LayoutManager layoutManager,
+    public void initializeWithNative(LayoutManagerImpl layoutManager,
             OnClickListener tabSwitcherClickHandler, OnClickListener newTabClickHandler,
             OnClickListener bookmarkClickHandler, OnClickListener customTabsBackClickHandler,
             Supplier<Boolean> showStartSurfaceSupplier) {
         super.initializeWithNative(layoutManager, tabSwitcherClickHandler, newTabClickHandler,
                 bookmarkClickHandler, customTabsBackClickHandler, showStartSurfaceSupplier);
 
-        if (mBottomControlsCoordinator != null) {
+        if (mBottomControlsCoordinatorSupplier.get() != null) {
             ApiCompatibilityUtils.setAccessibilityTraversalBefore(
                     mLocationBar.getContainerView(), R.id.bottom_toolbar);
         }
@@ -196,7 +203,7 @@ public void destroy() {
     protected void onOrientationChange(int newOrientation) {
         if (mActionModeController != null) mActionModeController.showControlsOnOrientationChange();
 
-        if (mBottomControlsCoordinator != null
+        if (mBottomControlsCoordinatorSupplier.get() != null
                 && BottomToolbarConfiguration.isBottomToolbarEnabled()) {
             boolean isBottomToolbarVisible = newOrientation != Configuration.ORIENTATION_LANDSCAPE;
             setBottomToolbarVisible(isBottomToolbarVisible);
@@ -227,8 +234,8 @@ protected void updateBookmarkButtonStatus() {
                 currentTab == null || bridge == null || bridge.isEditBookmarksEnabled();
         mToolbar.updateBookmarkButton(isBookmarked, editingAllowed);
 
-        if (mBottomControlsCoordinator instanceof BraveBottomControlsCoordinator) {
-            ((BraveBottomControlsCoordinator) mBottomControlsCoordinator)
+        if (mBottomControlsCoordinatorSupplier.get() instanceof BraveBottomControlsCoordinator) {
+            ((BraveBottomControlsCoordinator) mBottomControlsCoordinatorSupplier.get())
                     .updateBookmarkButton(isBookmarked, editingAllowed);
         }
     }
@@ -245,7 +252,7 @@ private void setBottomToolbarVisible(boolean visible) {
         if (mToolbar instanceof BraveTopToolbarCoordinator) {
             ((BraveTopToolbarCoordinator) mToolbar).onBottomToolbarVisibilityChanged(visible);
         }
-        mBottomControlsCoordinator.setBottomControlsVisible(visible);
+        mBottomControlsCoordinatorSupplier.get().setBottomControlsVisible(visible);
     }
 
     public boolean isBottomToolbarVisible() {

diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
@@ -35,6 +35,7 @@
 import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareDelegate;
+import org.chromium.chrome.browser.share.ShareDelegateImpl.ShareOrigin;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
 import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil;
@@ -78,7 +79,6 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
     private final Callback<ShareDelegate> mShareDelegateSupplierCallback;
     private ObservableSupplierImpl<OnClickListener> mShareButtonListenerSupplier =
             new ObservableSupplierImpl<>();
-    private final Supplier<Boolean> mShowStartSurfaceCallable;
     private CallbackController mCallbackController = new CallbackController();
     ObservableSupplier<AppMenuButtonHelper> mMenuButtonHelperSupplier;
     private BottomControlsMediator mBottomControlsMediator;
@@ -98,8 +98,6 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
      * @param themeColorProvider The {@link ThemeColorProvider} for the bottom toolbar.
      * @param shareDelegateSupplier The supplier for the {@link ShareDelegate} the bottom controls
      *         should use to share content.
-     * @param showStartSurfaceCallable The action that opens the start surface, returning true if
-     * the start surface is shown.
      * @param openHomepageAction The action that opens the homepage.
      * @param setUrlBarFocusAction The function that sets Url bar focus. The first argument is
      * @param overviewModeBehaviorSupplier Supplier for the overview mode manager.
@@ -108,8 +106,7 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
     BottomToolbarCoordinator(ScrollingBottomViewResourceFrameLayout scrollingBottomView,
             ViewStub stub, ActivityTabProvider tabProvider,
             OnLongClickListener tabsSwitcherLongClickListner, ThemeColorProvider themeColorProvider,
-            ObservableSupplier<ShareDelegate> shareDelegateSupplier,
-            Supplier<Boolean> showStartSurfaceCallable, Runnable openHomepageAction,
+            ObservableSupplier<ShareDelegate> shareDelegateSupplier, Runnable openHomepageAction,
             Callback<Integer> setUrlBarFocusAction,
             OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier,
             ObservableSupplier<AppMenuButtonHelper> menuButtonHelperSupplier,
@@ -119,18 +116,11 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
         layoutStateProviderSupplier.onAvailable(
                 mCallbackController.makeCancelable(this::setLayoutStateProvider));
 
-        mShowStartSurfaceCallable = showStartSurfaceCallable;
         final OnClickListener homeButtonListener = v -> {
             openHomepageAction.run();
         };
 
         final OnClickListener searchAcceleratorListener = v -> {
-            // Only switch to HomePage when overview is showing.
-            if (mLayoutStateProvider != null
-                    && mLayoutStateProvider.isLayoutVisible(LayoutType.TAB_SWITCHER)
-                    && mShowStartSurfaceCallable != null) {
-                mShowStartSurfaceCallable.get();
-            }
             setUrlBarFocusAction.onResult(OmniboxFocusReason.ACCELERATOR_TAP);
         };
 
@@ -340,7 +330,7 @@ private void onShareDelegateAvailable(ShareDelegate shareDelegate) {
             }
 
             Tab tab = mTabProvider.get();
-            shareDelegate.share(tab, /*shareDirectly=*/false);
+            shareDelegate.share(tab, /*shareDirectly=*/false, ShareOrigin.TOP_TOOLBAR);
         };
 
         mShareButtonListenerSupplier.set(shareButtonListener);