From faad40c505fa4310477727093ce2c5375c31a24d Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Wed, 20 Aug 2025 11:41:05 -0400 Subject: [PATCH] [cr141][Android] Move E2ELayout related code to //ui/edge_to_edge Chromium changes: https://chromium.googlesource.com/chromium/src/+/f2e21c980c2bf08ed6a578ea408a5d9db04cfb27 commit f2e21c980c2bf08ed6a578ea408a5d9db04cfb27 Author: Joel Tan-Aristy Date: Tue Aug 19 11:27:32 2025 -0700 [E2E] Move E2ELayout related code to //ui/edge_to_edge Moved Edge to Edge layout classes to a new //ui/edge_to_edge directory. Bug: 428281174 Bypass-Check-License: Refactoring directory Change-Id: I91fa6da9535d8f5f1956b135040a578466952900 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6804203 Reviewed-by: Jesse McKenna Reviewed-by: Tomasz Wiszkowski Reviewed-by: Theresa Sullivan Reviewed-by: Xiyuan Xia Reviewed-by: Charles Hager Commit-Queue: Joel Tan-Aristy Reviewed-by: Wenyu Fu Reviewed-by: Glenn Hartmann Cr-Commit-Position: refs/heads/main@{#1503489} --- .../browser/bookmarks/BraveBookmarkManagerCoordinator.java | 2 +- .../customtabs/FullScreenCustomTabRootUiCoordinator.java | 2 +- .../browser/tabbed_mode/BraveTabbedRootUiCoordinator.java | 4 ++-- .../browser/ui/system/BraveStatusBarColorController.java | 2 +- .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 4 ++-- test/BUILD.gn | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java index 746a30c3bc7..9d1ca4426a7 100644 --- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java +++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java @@ -14,8 +14,8 @@ import org.chromium.build.annotations.NullMarked; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; -import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgePadAdjuster; import org.chromium.ui.base.ActivityWindowAndroid; +import org.chromium.ui.edge_to_edge.EdgeToEdgePadAdjuster; import java.util.function.Function; diff --git a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java index 78f0ae1e90e..9c57bd73847 100644 --- a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java @@ -41,10 +41,10 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider; import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; -import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager; import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.IntentRequestTracker; +import org.chromium.ui.edge_to_edge.EdgeToEdgeManager; import org.chromium.ui.modaldialog.ModalDialogManager; import java.util.function.BooleanSupplier; 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 c275e3ed585..39e88eed57a 100644 --- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java @@ -52,11 +52,11 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider; -import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager; -import org.chromium.components.browser_ui.edge_to_edge.SystemBarColorHelper; import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.IntentRequestTracker; +import org.chromium.ui.edge_to_edge.EdgeToEdgeManager; +import org.chromium.ui.edge_to_edge.SystemBarColorHelper; import org.chromium.ui.insets.InsetObserver; import org.chromium.ui.modaldialog.ModalDialogManager; diff --git a/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java b/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java index e0837647623..c93711d403c 100644 --- a/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java +++ b/android/java/org/chromium/chrome/browser/ui/system/BraveStatusBarColorController.java @@ -20,7 +20,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider; import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; -import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeSystemBarColorHelper; +import org.chromium.ui.edge_to_edge.EdgeToEdgeSystemBarColorHelper; import org.chromium.ui.util.ColorUtils; @NullMarked diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 8003d8cc292..0b9827f5174 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -156,8 +156,6 @@ import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; -import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager; -import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeSystemBarColorHelper; import org.chromium.components.browser_ui.media.MediaNotificationInfo; import org.chromium.components.browser_ui.site_settings.ContentSettingException; import org.chromium.components.browser_ui.site_settings.PermissionInfo; @@ -197,6 +195,8 @@ import org.chromium.ui.ViewProvider; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.base.WindowAndroid; +import org.chromium.ui.edge_to_edge.EdgeToEdgeManager; +import org.chromium.ui.edge_to_edge.EdgeToEdgeSystemBarColorHelper; import org.chromium.ui.insets.InsetObserver; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modaldialog.ModalDialogProperties; diff --git a/test/BUILD.gn b/test/BUILD.gn index aea5fae8fd3..27534d1a2c6 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1338,7 +1338,6 @@ if (is_android) { "//components/browser_ui/bottomsheet/android:java", "//components/browser_ui/bottomsheet/android:manager_java", "//components/browser_ui/desktop_windowing/android:java", - "//components/browser_ui/edge_to_edge/android:java", "//components/browser_ui/media/android:java", "//components/browser_ui/settings/android:java", "//components/browser_ui/site_settings/android:java", @@ -1372,6 +1371,7 @@ if (is_android) { "//third_party/junit", "//third_party/mockito:mockito_java", "//ui/android:ui_no_recycler_view_java", + "//ui/edge_to_edge:java", "//url:gurl_java", "//url/mojom:url_mojom_gurl_java", ]