From 63d7f64469e32c3cbff61073cf50e6d8614ea2b7 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Mon, 21 Jul 2025 12:17:44 +0300 Subject: [PATCH] [cr140][Android] CustomTabFeatureOverridesManager was removed Chromium change: https://source.chromium.org/chromium/chromium/src/+/ec3cf2613084e5182c782597546deca62ac15598 Clean up CCT feature overrides Bug: 427494350 Change-Id: If7fda6786b3b092262a10f37221520c45cea3dff Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6769954 --- android/java/apk_for_test.flags | 1 - .../browser/customtabs/FullScreenCustomTabActivity.java | 5 +---- .../customtabs/FullScreenCustomTabRootUiCoordinator.java | 2 -- .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 4 ---- .../bytecode/BraveBaseCustomTabActivityClassAdapter.java | 3 --- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index ee40e25040b..1c8e1edc2ba 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -911,7 +911,6 @@ *** mToolbarCoordinator; *** mTabController; *** mMinimizationManagerHolder; - *** mCustomTabFeatureOverridesManager; *** getAppHeaderCoordinator(...); *** getBrowserServicesThemeColorProvider(...); public (...); diff --git a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java index 57e8890e633..1d2620f5247 100644 --- a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java +++ b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java @@ -47,8 +47,7 @@ import org.chromium.ui.util.ColorUtils; /** New Rewards 3.0 custom tab activity */ public class FullScreenCustomTabActivity extends CustomTabActivity { - // Unused members, never read: - // - mIsEnterAnimationCompleted + // Exposed through bytecode patch @SuppressWarnings("UnusedVariable") private boolean mIsEnterAnimationCompleted; @@ -60,7 +59,6 @@ public class FullScreenCustomTabActivity extends CustomTabActivity { private BrowserServicesIntentDataProvider mIntentDataProvider; private CustomTabActivityTabController mTabController; private CustomTabMinimizationManagerHolder mMinimizationManagerHolder; - private CustomTabFeatureOverridesManager mCustomTabFeatureOverridesManager; public static boolean sIsFullScreenCustomTabActivityClosed; @@ -229,7 +227,6 @@ public class FullScreenCustomTabActivity extends CustomTabActivity { mBackPressManager, () -> mTabController, () -> mMinimizationManagerHolder.getMinimizationManager(), - () -> mCustomTabFeatureOverridesManager, () -> getCustomTabActivityNavigationController().openCurrentUrlInBrowser(), getEdgeToEdgeManager(), getAppHeaderCoordinator(), diff --git a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java index 8b3cd3e65ad..5b3ab11da19 100644 --- a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java @@ -83,7 +83,6 @@ public class FullScreenCustomTabRootUiCoordinator extends BaseCustomTabRootUiCoo @NonNull BackPressManager backPressManager, @NonNull Supplier tabController, @NonNull Supplier minimizeDelegateSupplier, - @NonNull Supplier featureOverridesManagerSupplier, @NonNull Runnable openInBrowserRunnable, @NonNull EdgeToEdgeManager edgeToEdgeManager, @Nullable DesktopWindowStateManager desktopWindowStateManager, @@ -122,7 +121,6 @@ public class FullScreenCustomTabRootUiCoordinator extends BaseCustomTabRootUiCoo backPressManager, tabController, minimizeDelegateSupplier, - featureOverridesManagerSupplier, openInBrowserRunnable, edgeToEdgeManager, desktopWindowStateManager, diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index a9b659e57b9..09e94c2d8fb 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -2377,10 +2377,6 @@ public class BytecodeTest { fieldExists( "org/chromium/chrome/browser/customtabs/BaseCustomTabActivity", "mMinimizationManagerHolder")); - Assert.assertTrue( - fieldExists( - "org/chromium/chrome/browser/customtabs/BaseCustomTabActivity", - "mCustomTabFeatureOverridesManager")); Assert.assertFalse( fieldExists( "org/chromium/chrome/browser/media/FullscreenVideoPictureInPictureController", // presubmit: ignore-long-line diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveBaseCustomTabActivityClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveBaseCustomTabActivityClassAdapter.java index cfff683f861..b82b85c00d0 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveBaseCustomTabActivityClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveBaseCustomTabActivityClassAdapter.java @@ -31,9 +31,6 @@ public class BraveBaseCustomTabActivityClassAdapter extends BraveClassVisitor { deleteField(sFullScreenCustomTabActivityClassName, "mMinimizationManagerHolder"); makeProtectedField(sBaseCustomTabActivityClassName, "mMinimizationManagerHolder"); - deleteField(sFullScreenCustomTabActivityClassName, "mCustomTabFeatureOverridesManager"); - makeProtectedField(sBaseCustomTabActivityClassName, "mCustomTabFeatureOverridesManager"); - deleteMethod(sFullScreenCustomTabActivityClassName, "getAppHeaderCoordinator"); makePublicMethod(sBaseCustomTabActivityClassName, "getAppHeaderCoordinator");