Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr141][Android] Moves PasswordManagerHelper code to BravePasswordManagerHelper

Browse Source 
Chromium changes:
https://chromium.googlesource.com/chromium/src/+/d0940950fdb4359249fe5ee6018a76668e9c2b9e

commit d0940950fdb4359249fe5ee6018a76668e9c2b9e
Author: Victor Hugo Vianna Silva <victorvianna@google.com>
Date:   Thu Aug 21 12:19:31 2025 -0700

    Remove unused code in PasswordManagerHelper

    Bug: None
    Change-Id: I8249cb0a4e8273a819307dbfd5bbddc3d2b0b6ce
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6870717
    Commit-Queue: Victor Vianna <victorvianna@google.com>
    Auto-Submit: Victor Vianna <victorvianna@google.com>
    Reviewed-by: Ivana Žužić <izuzic@google.com>
    Cr-Commit-Position: refs/heads/main@{#1504668}
This commit is contained in:
Artem Samoilenko
2025-09-22 14:59:49 -04:00
committed by Max Karolinskiy
parent 34f1d61e39
commit 39c30d2d47
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+7 -6
View File
@@ -36,8 +36,8 @@ import org.chromium.build.annotations.Initializer;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.password_manager.BravePasswordManagerHelper;
import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
import org.chromium.chrome.browser.password_manager.PasswordManagerHelper;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
@@ -163,14 +163,14 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
@Nullable Bundle savedInstanceState) {
if (savedInstanceState != null
&& savedInstanceState.containsKey(
PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER)) {
return savedInstanceState.getInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER);
BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER)) {
return savedInstanceState.getInt(BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER);
}
Bundle extras = getArguments();
assert extras.containsKey(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER)
assert extras.containsKey(BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER)
: "PasswordSettings must be launched with a manage-passwords-referrer fragment"
+ "argument, but none was provided.";
return extras.getInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER);
return extras.getInt(BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER);
}
@Override
@@ -454,7 +454,8 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
if (mSearchQuery != null) {
outState.putString(SAVED_STATE_SEARCH_QUERY, mSearchQuery);
}
outState.putInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, mManagePasswordsReferrer);
outState.putInt(
BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, mManagePasswordsReferrer);
}
@Override
android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java
+3 -2
View File
@@ -17,8 +17,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.chromium.base.test.util.Batch;
import org.chromium.chrome.browser.password_manager.BravePasswordManagerHelper;
import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
import org.chromium.chrome.browser.password_manager.PasswordManagerHelper;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
@@ -36,7 +36,8 @@ public class BravePasswordSettingsTest {
@Before
public void setUp() throws Exception {
Bundle fragmentArgs = new Bundle();
fragmentArgs.putInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER,
fragmentArgs.putInt(
BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER,
ManagePasswordsReferrer.CHROME_SETTINGS);
mSettingsActivityTestRule.startSettingsActivity(fragmentArgs);
mSavePasswordPreferences = mSettingsActivityTestRule.getFragment();
browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java
+5
View File
@@ -23,6 +23,11 @@ public class BravePasswordManagerHelper extends PasswordManagerHelper {
private static final String TAG = "BravePasswords";
protected static @Nullable ProfileKeyedMap<PasswordManagerHelper> sProfileMap;
// Key for the argument with which PasswordsSettings will be launched. The value for
// this argument should be part of the ManagePasswordsReferrer enum, which contains
// all points of entry to the passwords settings.
public static final String MANAGE_PASSWORDS_REFERRER = "manage-passwords-referrer";
BravePasswordManagerHelper(Profile profile) {
super(profile);
}