Skip to content

Commit

Permalink
HomepageManager.shouldCloseAppWithZeroTabs is non-static now
Browse files Browse the repository at this point in the history
Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/618819a4be308d02459fb6b06df5a00515b5ee26

	Convert static methods in HomepageManager to non-static.

	This works towards passing in a Profile into HomepageManager
	and remove the static Profile access internally.

	Bug: 338276230
	Change-Id: Ib20372f0494cf2fc75d3a51c03fa31e7d7b587f5
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5507082
  • Loading branch information
AlexeyBarabash authored and emerick committed May 24, 2024
1 parent a4cfcc9 commit 7505fce
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager;

// see org.brave.bytecode.BraveHomepageManagerClassAdapter
public class BraveHomepageManager {
public static boolean shouldCloseAppWithZeroTabs() {
public class BraveHomepageManager extends HomepageManager {
@Override
public boolean shouldCloseAppWithZeroTabs() {
return CloseBraveManager.shouldCloseAppWithZeroTabs();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public void testMethodsExist() throws Exception {
methodExists(
"org/chromium/chrome/browser/homepage/HomepageManager",
"shouldCloseAppWithZeroTabs",
MethodModifier.STATIC,
MethodModifier.REGULAR,
false,
null));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@
import org.objectweb.asm.ClassVisitor;

public class BraveHomepageManagerClassAdapter extends BraveClassVisitor {
static String sHomepageManagerClassName = "org/chromium/chrome/browser/homepage/HomepageManager";
static String sBraveHomepageManagerClassName = "org/chromium/chrome/browser/homepage/BraveHomepageManager";
static String sHomepageManagerClassName =
"org/chromium/chrome/browser/homepage/HomepageManager";
static String sBraveHomepageManagerClassName =
"org/chromium/chrome/browser/homepage/BraveHomepageManager";

public BraveHomepageManagerClassAdapter(ClassVisitor visitor) {
super(visitor);
changeMethodOwner(sHomepageManagerClassName, "shouldCloseAppWithZeroTabs", sBraveHomepageManagerClassName);

redirectConstructor(sHomepageManagerClassName, sBraveHomepageManagerClassName);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
index de101add328a69dd406b9ce34881f76feb21ae23..c58148164d7f7dc931154cfd55d55ba053a4becd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
@@ -50,7 +50,7 @@ public class HomepageManager
private final ObserverList<HomepageStateListener> mHomepageStateListeners;
private SettingsLauncher mSettingsLauncher;

- private HomepageManager() {
+ HomepageManager() {
mSharedPreferencesManager = ChromeSharedPreferences.getInstance();
mHomepageStateListeners = new ObserverList<>();
HomepagePolicyManager.getInstance().addListener(this);

0 comments on commit 7505fce

Please sign in to comment.