Merge pull request #15543 from brave/pr15517_cookie_consent_page_upda…

…te_1.45.x Dismiss cookie consent modal on new tab switcher and new tab page (uplift to 1.45.x)
brave · Oct 20, 2022 · 646c119 · 646c119
2 parents 03d976f + 0f82b2b
commit 646c119
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -1283,6 +1283,13 @@ public void dismissShieldsTooltip() {
         }
     }
 
+    public void dismissCookieConsent() {
+        BraveToolbarLayoutImpl layout = getBraveToolbarLayout();
+        if (layout != null) {
+            layout.dismissCookieConsent();
+        }
+    }
+
     public void openRewardsPanel() {
         BraveToolbarLayoutImpl layout = getBraveToolbarLayout();
         if (layout != null) {

diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -25,6 +25,7 @@
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
+import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
 import org.chromium.chrome.browser.back_press.BackPressManager;
@@ -40,6 +41,7 @@
 import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.identity_disc.IdentityDiscController;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
+import org.chromium.chrome.browser.layouts.LayoutType;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.merchant_viewer.MerchantTrustSignalsCoordinator;
 import org.chromium.chrome.browser.night_mode.NightModeStateProvider;
@@ -114,6 +116,8 @@ public class BraveToolbarManager extends ToolbarManager {
     private TabCreatorManager mTabCreatorManager;
     private SnackbarManager mSnackbarManager;
     private TabObscuringHandler mTabObscuringHandler;
+    private LayoutStateProvider.LayoutStateObserver mLayoutStateObserver;
+    private LayoutStateProvider mLayoutStateProvider;
 
     // Own members.
     private boolean mIsBottomToolbarVisible;
@@ -197,6 +201,24 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
             }
         };
         HomepageManager.getInstance().addListener(mBraveHomepageStateListener);
+        mLayoutStateProviderSupplier.onAvailable(
+                mCallbackController.makeCancelable(this::setLayoutStateProvider));
+    }
+
+    private void setLayoutStateProvider(LayoutStateProvider layoutStateProvider) {
+        mLayoutStateObserver = new LayoutStateProvider.LayoutStateObserver() {
+            @Override
+            public void onStartedShowing(@LayoutType int layoutType, boolean showToolbar) {
+                if (layoutType == LayoutType.TAB_SWITCHER) {
+                    BraveActivity braveActivity = BraveActivity.getBraveActivity();
+                    if (braveActivity != null) {
+                        braveActivity.dismissCookieConsent();
+                    }
+                }
+            }
+        };
+        mLayoutStateProvider = layoutStateProvider;
+        mLayoutStateProvider.addObserver(mLayoutStateObserver);
     }
 
     @Override
@@ -287,8 +309,11 @@ public void initializeWithNative(LayoutManagerImpl layoutManager,
     @Override
     public void destroy() {
         super.destroy();
-
         HomepageManager.getInstance().removeListener(mBraveHomepageStateListener);
+        if (mLayoutStateProvider != null) {
+            mLayoutStateProvider.removeObserver(mLayoutStateObserver);
+            mLayoutStateProvider = null;
+        }
     }
 
     protected void onOrientationChange(int newOrientation) {

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
@@ -102,6 +102,7 @@
 import org.chromium.chrome.browser.shields.BraveShieldsUtils;
 import org.chromium.chrome.browser.shields.CookieListOptInServiceFactory;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabHidingType;
 import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tab.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
@@ -417,6 +418,11 @@ public void onShown(Tab tab, @TabSelectionType int type) {
                 }
             }
 
+            @Override
+            public void onHidden(Tab tab, @TabHidingType int reason) {
+                dismissCookieConsent();
+            }
+
             @Override
             public void onPageLoadStarted(Tab tab, GURL url) {
                 showWalletIcon(false);
@@ -701,6 +707,13 @@ public void dismissShieldsTooltip() {
         }
     }
 
+    public void dismissCookieConsent() {
+        if (mCookieConsentTooltip != null && mCookieConsentTooltip.isShowing()) {
+            mCookieConsentTooltip.dismiss();
+            mCookieConsentTooltip = null;
+        }
+    }
+
     public void reopenShieldsPanel() {
         if (mBraveShieldsHandler != null && mBraveShieldsHandler.isShowing()) {
             mBraveShieldsHandler.hideBraveShieldsMenu();