Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4a807a53 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Restore chrome password store: Do not delete the password database on startup (#2449)

parent 887cafc2
Loading
Loading
Loading
Loading
+19 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../android/pwm_disabled/BUILD.gn             |   2 -
 .../password_store_backend_factory.cc         |  14 +-
 ...ssword_manager_settings_service_factory.cc |   4 +-
 chrome/browser/prefs/browser_prefs.cc         |   7 -
 .../strings/android_chrome_strings.grd        | 123 +++-
 .../Import-Password-Android.grdp              |   9 +
 .../autofill/core/common/autofill_features.cc |   1 +
@@ -83,7 +84,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../core/common/password_manager_pref_names.h |   2 -
 components/sync/service/sync_prefs.cc         |   2 +-
 .../Restore-chrome-password-store.inc         |   1 +
 75 files changed, 5536 insertions(+), 64 deletions(-)
 76 files changed, 5536 insertions(+), 71 deletions(-)
 create mode 100644 chrome/android/java/res/layout/password_no_result.xml
 create mode 100644 chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -5993,6 +5994,23 @@ diff --git a/chrome/browser/password_manager/password_manager_settings_service_f
       profile->GetPrefs());
-#endif
 }
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -3064,13 +3064,6 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
   profile_prefs->ClearPref(kObsoletePasswordsUseUPMLocalAndSeparateStores);
   profile_prefs->ClearPref(kObsoleteEmptyProfileStoreLoginDatabase);
   profile_prefs->ClearPref(kObsoleteUpmAutoExportCsvNeedsDeletion);
-  base::DeleteFile(profile_path.Append(FILE_PATH_LITERAL("Login Data")));
-  base::DeleteFile(
-      profile_path.Append(FILE_PATH_LITERAL("Login Data For Account")));
-  base::DeleteFile(
-      profile_path.Append(FILE_PATH_LITERAL("Login Data-journal")));
-  base::DeleteFile(
-      profile_path.Append(FILE_PATH_LITERAL("Login Data For Account-journal")));
 #endif  // BUILDFLAG(IS_ANDROID)
 
   // Added 09/2025.
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd