diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 70b1e86e63e8..242b6b9b0429 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -640,7 +640,7 @@ } -keep class org.chromium.chrome.browser.tasks.ReturnToChromeUtil { - *** shouldShowTabSwitcher(...); + *** shouldShowNtpAsHomeSurfaceAtStartup(...); } -keep class org.chromium.chrome.browser.IntentHandler { diff --git a/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java b/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java index 57017beecc72..f4cbfae498eb 100644 --- a/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java +++ b/android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java @@ -5,14 +5,16 @@ package org.chromium.chrome.browser.tasks; -import org.chromium.chrome.browser.flags.ChromeFeatureList; +import android.content.Intent; +import android.os.Bundle; -public final class BraveReturnToChromeUtil { - public static boolean shouldShowTabSwitcher(final long lastTimeMillis) { - if (!ChromeFeatureList.sStartSurfaceReturnTime.isEnabled()) { - return false; - } +import org.chromium.chrome.browser.ChromeInactivityTracker; - return ReturnToChromeUtil.shouldShowTabSwitcher(lastTimeMillis); +public final class BraveReturnToChromeUtil { + /** Returns whether should show a NTP as the home surface at startup. */ + public static boolean shouldShowNtpAsHomeSurfaceAtStartup( + Intent intent, Bundle bundle, ChromeInactivityTracker inactivityTracker) { + // We do not want to show the NTP at start up in Brave. + return false; } } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 50bb965a2cf6..65bb4de94f58 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -651,11 +651,13 @@ public void testMethodsExist() throws Exception { Assert.assertTrue( methodExists( "org/chromium/chrome/browser/tasks/ReturnToChromeUtil", - "shouldShowTabSwitcher", + "shouldShowNtpAsHomeSurfaceAtStartup", MethodModifier.STATIC, true, boolean.class, - long.class)); + Intent.class, + Bundle.class, + ChromeInactivityTracker.class)); Assert.assertTrue( methodExists( "org/chromium/chrome/browser/IntentHandler", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveReturnToChromeUtilClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveReturnToChromeUtilClassAdapter.java index 3504c265d10f..a203592bd258 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveReturnToChromeUtilClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveReturnToChromeUtilClassAdapter.java @@ -16,7 +16,9 @@ public class BraveReturnToChromeUtilClassAdapter extends BraveClassVisitor { public BraveReturnToChromeUtilClassAdapter(ClassVisitor visitor) { super(visitor); - changeMethodOwner(sReturnToChromeUtilClassName, "shouldShowTabSwitcher", + changeMethodOwner( + sReturnToChromeUtilClassName, + "shouldShowNtpAsHomeSurfaceAtStartup", sBraveReturnToChromeUtilClassName); } }