diff --git a/build/patches/Restore-chrome-password-store.patch b/build/patches/Restore-chrome-password-store.patch index 5513148e..b09fd361 100644 --- a/build/patches/Restore-chrome-password-store.patch +++ b/build/patches/Restore-chrome-password-store.patch @@ -4,10 +4,31 @@ Subject: Restore chrome password store License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/ui/android/strings/android_chrome_strings.grd | 2 +- - components/password_manager/core/browser/buildflags.gni | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + chrome/browser/resources/password_manager/user_utils_mixin.ts | 4 ++-- + chrome/browser/ui/android/strings/android_chrome_strings.grd | 2 +- + components/password_manager/core/browser/buildflags.gni | 2 +- + components/sync/base/features.cc | 1 + + .../password_features_cc/Restore-chrome-password-store.inc | 1 + + 5 files changed, 6 insertions(+), 4 deletions(-) + create mode 100644 cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc +diff --git a/chrome/browser/resources/password_manager/user_utils_mixin.ts b/chrome/browser/resources/password_manager/user_utils_mixin.ts +--- a/chrome/browser/resources/password_manager/user_utils_mixin.ts ++++ b/chrome/browser/resources/password_manager/user_utils_mixin.ts +@@ -129,11 +129,11 @@ export const UserUtilMixin = dedupingMixin( + } + + private computeIsEligibleForAccountStorage_(): boolean { +- return !!this.syncInfo_ && this.syncInfo_.isEligibleForAccountStorage; ++ return !!this.syncInfo_ && !!this.syncInfo_.isEligibleForAccountStorage; + } + + private computeIsSyncingPasswords_(): boolean { +- return !!this.syncInfo_ && this.syncInfo_.isSyncingPasswords; ++ return !!this.syncInfo_ && !!this.syncInfo_.isSyncingPasswords; + } + + private computeAccountEmail_(): string { 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 @@ -32,4 +53,21 @@ diff --git a/components/password_manager/core/browser/buildflags.gni b/component } # Drawables from the downstream clank/ repository are +diff --git a/components/sync/base/features.cc b/components/sync/base/features.cc +--- a/components/sync/base/features.cc ++++ b/components/sync/base/features.cc +@@ -99,6 +99,7 @@ BASE_FEATURE(kEnablePasswordsAccountStorageForNonSyncingUsers, + base::FEATURE_ENABLED_BY_DEFAULT + #endif + ); ++SET_CROMITE_FEATURE_DISABLED(kEnablePasswordsAccountStorageForNonSyncingUsers); + + BASE_FEATURE(kSyncEnableContactInfoDataTypeForDasherUsers, + "SyncEnableContactInfoDataTypeForDasherUsers", +diff --git a/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc b/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kSkipUndecryptablePasswords); --