[Passwords] Show weak passwords audit - Implementation review fixes
This change shows proper string when user is signed out and there are no
weak passwords.
(cherry picked from commit 5ea94beaba635587d1353c453f60ae4d1ea4bca4)
Bug: 1135155
Change-Id: I46da38d75f48bc230058cf9f6f36b3effd0cd45f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2448373
Commit-Queue: Viktor Semeniuk <[email protected]>
Reviewed-by: Vasilii Sukhanov <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#814157}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463572
Reviewed-by: Viktor Semeniuk <[email protected]>
Cr-Commit-Position: refs/branch-heads/4280@{#240}
Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index 4c04a94..f480b35d 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -358,6 +358,9 @@
=1 {Found {COUNT} security issue}
other {Found {COUNT} security issues}}
</message>
+ <message name="IDS_SETTINGS_NO_WEAK_PASSWORDS_FOUND" desc="Description used only when user is signed out and full password check was not completed and no weak passwords found afther the password weakness check.">
+ No weak passwords found
+ </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_AGAIN" desc="Button to start bulk password check manually in passwords check section.">
Check again
</message>
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_NO_WEAK_PASSWORDS_FOUND.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_NO_WEAK_PASSWORDS_FOUND.png.sha1
new file mode 100644
index 0000000..9e0b2cd
--- /dev/null
+++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_NO_WEAK_PASSWORDS_FOUND.png.sha1
@@ -0,0 +1 @@
+f98266388839e9dc46d35d665233cd4be31b7d56
\ No newline at end of file
diff --git a/chrome/browser/resources/settings/autofill_page/password_check.html b/chrome/browser/resources/settings/autofill_page/password_check.html
index 46fdf9c..a3a0c899 100644
--- a/chrome/browser/resources/settings/autofill_page/password_check.html
+++ b/chrome/browser/resources/settings/autofill_page/password_check.html
@@ -88,7 +88,7 @@
</div>
<div class="secondary" id="subtitle"
hidden$="[[!showsPasswordsCount_(status, leakedPasswords, weakPasswords)]]">
- [[getPasswordsCount_(insecurePasswordsCount, compromisedPasswordsCount)]]
+ [[getPasswordsCount_(status, insecurePasswordsCount, compromisedPasswordsCount)]]
</div>
</div>
<cr-button id="controlPasswordCheckButton"
diff --git a/chrome/browser/resources/settings/autofill_page/password_check.js b/chrome/browser/resources/settings/autofill_page/password_check.js
index 06bf7ca..fad2d593 100644
--- a/chrome/browser/resources/settings/autofill_page/password_check.js
+++ b/chrome/browser/resources/settings/autofill_page/password_check.js
@@ -661,7 +661,12 @@
*/
getPasswordsCount_() {
if (this.passwordsWeaknessCheckEnabled) {
- return this.insecurePasswordsCount;
+ if (this.isSignedOut_ &&
+ this.leakedPasswords.length + this.weakPasswords.length === 0) {
+ return this.i18n('noWeakPasswords');
+ } else {
+ return this.insecurePasswordsCount;
+ }
} else {
return this.compromisedPasswordsCount;
}
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index 15ada6a..bb0272c5a 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -823,6 +823,7 @@
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC},
{"noCompromisedCredentials",
IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL},
+ {"noWeakPasswords", IDS_SETTINGS_NO_WEAK_PASSWORDS_FOUND},
{"checkPasswordsAgain", IDS_SETTINGS_CHECK_PASSWORDS_AGAIN},
{"checkPasswordsAgainAfterError",
IDS_SETTINGS_CHECK_PASSWORDS_AGAIN_AFTER_ERROR},
