From 4176d4014a3457f9c783fef644933d690feb5a8a Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Fri, 21 Feb 2025 16:09:02 -0500 Subject: [PATCH] [Android] Remove base chrome layout Chromium change: https://chromium.googlesource.com/chromium/src/+/76fac7530c580e7183de4aa7ecd34b837e38fb17 Fix incorrect anchor placement for Omnibox Suggestions Dropdown The placement of the Anchor view for the Omnibox Suggestions Dropdown was being computed based on a view with a different on-screen origin (different (0,0) coordinates) than the view hosting the dropdown. This mismatch caused visible gaps in multiple scenarios. This change ensures that the parent view, which hosts both the Omnibox Suggestions Dropdown and the anchor view, is used for positioning. This approach eliminates the current issue and prevents similar alignment problems in the future. The change directly fixes the problem with Edge To Edge Everywhere. --- .../browser/customtabs/FullScreenCustomTabActivity.java | 1 - .../customtabs/FullScreenCustomTabRootUiCoordinator.java | 5 ----- .../browser/tabbed_mode/BraveTabbedRootUiCoordinator.java | 5 +---- .../chromium/chrome/browser/toolbar/BraveToolbarManager.java | 2 -- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java index c7ac84e0563..19d9e8c0c9f 100644 --- a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java +++ b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java @@ -112,7 +112,6 @@ public class FullScreenCustomTabActivity extends CustomTabActivity { () -> mTabController, () -> mMinimizationManagerHolder.getMinimizationManager(), () -> mCustomTabFeatureOverridesManager, - getBaseChromeLayout(), getEdgeToEdgeManager()); return mBaseCustomTabRootUiCoordinator; } diff --git a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java index b28a53c0143..e5b360844b4 100644 --- a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java @@ -5,10 +5,7 @@ package org.chromium.chrome.browser.customtabs; -import android.view.View; - import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import org.chromium.base.supplier.ObservableSupplier; @@ -84,7 +81,6 @@ public class FullScreenCustomTabRootUiCoordinator extends BaseCustomTabRootUiCoo @NonNull Supplier tabController, @NonNull Supplier minimizeDelegateSupplier, @NonNull Supplier featureOverridesManagerSupplier, - @Nullable View baseChromeLayout, @NonNull EdgeToEdgeManager edgeToEdgeManager) { super( activity, @@ -121,7 +117,6 @@ public class FullScreenCustomTabRootUiCoordinator extends BaseCustomTabRootUiCoo tabController, minimizeDelegateSupplier, featureOverridesManagerSupplier, - baseChromeLayout, edgeToEdgeManager); } diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java index 82105b23935..36afd835b4f 100644 --- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java @@ -6,7 +6,6 @@ package org.chromium.chrome.browser.tabbed_mode; import android.os.Bundle; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -107,8 +106,7 @@ public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator { @NonNull BackPressManager backPressManager, @Nullable Bundle savedInstanceState, @Nullable MultiInstanceManager multiInstanceManager, - @Nullable ObservableSupplier overviewColorSupplier, - @Nullable View baseChromeLayout, + @NonNull ObservableSupplier overviewColorSupplier, @NonNull ManualFillingComponentSupplier manualFillingComponentSupplier, @NonNull EdgeToEdgeManager edgeToEdgeManager) { super( @@ -156,7 +154,6 @@ public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator { savedInstanceState, multiInstanceManager, overviewColorSupplier, - baseChromeLayout, manualFillingComponentSupplier, edgeToEdgeManager); diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 77ca9dab3a5..83dd5b8ce50 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -181,7 +181,6 @@ public class BraveToolbarManager extends ToolbarManager { boolean initializeWithIncognitoColors, @Nullable BackPressManager backPressManager, @Nullable ObservableSupplier overviewColorSupplier, - @Nullable View baseChromeLayout, ObservableSupplier readAloudControllerSupplier, @Nullable DesktopWindowStateManager desktopWindowStateManager) { super( @@ -225,7 +224,6 @@ public class BraveToolbarManager extends ToolbarManager { initializeWithIncognitoColors, backPressManager, overviewColorSupplier, - baseChromeLayout, readAloudControllerSupplier, desktopWindowStateManager);