Safety check callback: individual event per child (JS side)

* Splits safety check callbacks into 4 distinct events (one per child).
* Aggregates all callback constants on top of safety_check_page.js.
* Updates passwords and extensions callback to expect a UI string.

Bug: 1032584
Change-Id: Ia10c4809da2331fbc648c628469797eff5dd0504
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080266
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748008}

chrome/app/settings_chromium_strings.grdp

@@ -95,24 +95,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED" desc="This text describles that Chrome cannot update due to an unknown error.">
     Chromium didn't update, something went wrong. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Fix Chromium update problems and failed updates.<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_OFFLINE" desc="This text points out that the password check cannot run due to not having interent connection.">
-    Chromium can't check your passwords. Try checking your internet connection.
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SIGNED_OUT" desc="This text points out that the password check can only run when the user is signed in.">
-    Chromium can't check your passwords because you're not signed in
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_QUOTA_LIMIT" desc="This text points out that the passwords check cannot run and that the user should try again tomorrow.">
-    Chromium can't check all your passwords. Try again after 24 hours.
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_TOO_MANY_PASSWORDS" desc="This text points out that the password check cannot run due to the user having too many saved passwords.">
-    Chromium can't check your passwords because there are too many
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_ERROR" desc="This text points out that the passwords check encountered an unknown error.">
-    Chromium can't check your passwords. Try again later.
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_ERROR" desc="This text describles that safety check could not check extensions for an unkown reason.">
-    Chromium can't check your extensions. Try again later.
-  </message>
 
   <!-- People Page -->
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device.">

chrome/app/settings_google_chrome_strings.grdp

@@ -95,24 +95,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED" desc="This text describles that Chrome cannot update due to an unknown error.">
     Chrome didn't update, something went wrong. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Fix Chrome update problems and failed updates.<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_OFFLINE" desc="This text points out that the password check cannot run due to not having interent connection.">
-    Chrome can't check your passwords. Try checking your internet connection.
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SIGNED_OUT" desc="This text points out that the password check can only run when the user is signed in.">
-    Chrome can't check your passwords because you're not signed in
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_QUOTA_LIMIT" desc="This text points out that the passwords check cannot run and that the user should try again tomorrow.">
-    Chrome can't check all your passwords. Try again after 24 hours.
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_TOO_MANY_PASSWORDS" desc="This text points out that the password check cannot run due to the user having too many saved passwords.">
-    Chrome can't check your passwords because there are too many
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_ERROR" desc="This text points out that the passwords check encountered an unknown error.">
-    Chrome can't check your passwords. Try again later.
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_ERROR" desc="This text describles that safety check could not check extensions for an unkown reason.">
-    Chrome can't check your extensions. Try again later.
-  </message>
 
   <!-- People Page -->
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device.">

chrome/app/settings_strings.grdp

@@ -1543,18 +1543,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_PRIMARY_LABEL" desc="'Passwords' is an element in safety check that allows users to check for their passwords being compromised.">
     Passwords
   </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SAFE" desc="This text points out that the safety check password check has not found any compromised passwords.">
-    No compromised passwords found
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_COMPROMISED_SINGULAR" desc="This text points out that the safety check password check has found one compromised password.">
-    1 compromised password
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_COMPROMISED_PLURAL" desc="This text points out that the safety check password check has found multiple compromised passwords. The placeholder will be a numeral.">
-    <ph name="NUM_PASSWORDS">$1<ex>42</ex></ph> compromised passwords
-  </message>
-  <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_NO_PASSWORDS" desc="This text points out that password check cannot run due to the user not having saved passwords.">
-    No saved passwords
-  </message>
   <message name="IDS_SAFETY_CHECK_PASSWORDS_BUTTON_COMPROMISED" desc="This button allows users to change their compromised passwords.">
     Change passwords
   </message>
@@ -1579,27 +1567,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL" desc="'Extensions' is an element in safety check that shows the safety check status of installed extensions.">
     Extensions
   </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_SAFE" desc="This text describles that the user is protected from bad extensions.">
-    You're protected from bad extensions
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_ON_SINGULAR" desc="This text describles that the user has turned bad extensions back on.">
-    You turned 1 bad extension back on
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_ON_PLURAL" desc="This text describles that the user has turned bad extensions back on.">
-    You turned <ph name="NUM_EXTENSIONS">$1<ex>42</ex></ph> bad extensions back on
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_SINGULAR" desc="This text describles that bad extensions have been disabled.">
-    1 bad extension is off. You can also remove it.
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_PLURAL" desc="This text describles that bad extensions have been disabled.">
-    <ph name="NUM_EXTENSIONS">$1<ex>42</ex></ph> bad extensions are off. You can also remove them.
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_MANAGED_BY_ADMIN_SINGULAR" desc="This text describles that an administrator has turned bad extensions back on.">
-    Your administrator turned 1 bad extension back on
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_MANAGED_BY_ADMIN_PLURAL" desc="This text describles that an administrator has turned bad extensions back on.">
-    Your administrator turned <ph name="NUM_EXTENSIONS">$1<ex>42</ex></ph> bad extensions back on
-  </message>
   <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON" desc="This button allows users to review their extensions settings.">
     Review
   </message>

chrome/browser/resources/settings/safety_check_page/safety_check_page.html

@@ -109,7 +109,7 @@
         <div class="start settings-box-text">
           <div>$i18n{passwords}</div>
           <div class="secondary" no-search
-              inner-h-t-m-l="[[getPasswordsSubLabelText_(passwordsStatus_)]]">
+              inner-h-t-m-l="[[passwordsDisplayString_]]">
           </div>
         </div>
         <template is="dom-if"
@@ -156,7 +156,7 @@
         <div class="start settings-box-text">
           <div>$i18n{safetyCheckExtensionsPrimaryLabel}</div>
           <div class="secondary" no-search
-              inner-h-t-m-l="[[getExtensionsSubLabelText_(extensionsStatus_)]]">
+              inner-h-t-m-l="[[extensionsDisplayString_]]">
           </div>
         </div>
         <template is="dom-if"

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -1131,24 +1131,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL},
       {"safetyCheckUpdatesSubLabelFailedOffline",
        IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED_OFFLINE},
-      {"safetyCheckPasswordsSubLabelSafe",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SAFE},
-      {"safetyCheckPasswordsSubLabelCompromisedSingular",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_COMPROMISED_SINGULAR},
-      {"safetyCheckPasswordsSubLabelCompromisedPlural",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_COMPROMISED_PLURAL},
-      {"safetyCheckPasswordsSubLabelOffline",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_OFFLINE},
-      {"safetyCheckPasswordsSubLabelNoPasswords",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_NO_PASSWORDS},
-      {"safetyCheckPasswordsSubLabelSignedOut",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SIGNED_OUT},
-      {"safetyCheckPasswordsSubLabelQuotaLimit",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_QUOTA_LIMIT},
-      {"safetyCheckPasswordsSubLabelTooManyPasswords",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_TOO_MANY_PASSWORDS},
-      {"safetyCheckPasswordsSubLabelError",
-       IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_ERROR},
       {"safetyCheckPasswordsButtonCompromised",
        IDS_SAFETY_CHECK_PASSWORDS_BUTTON_COMPROMISED},
       {"safetyCheckPasswordsButtonError",
@@ -1163,22 +1145,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON},
       {"safetyCheckExtensionsPrimaryLabel",
        IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL},
-      {"safetyCheckExtensionsSubLabelError",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_ERROR},
-      {"safetyCheckExtensionsSubLabelSafe",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_SAFE},
-      {"safetyCheckExtensionsSubLabelBadExtensionsOnSingular",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_ON_SINGULAR},
-      {"safetyCheckExtensionsSubLabelBadExtensionsOnPlural",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_ON_PLURAL},
-      {"safetyCheckExtensionsSubLabelBadExtensionsOffSingular",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_SINGULAR},
-      {"safetyCheckExtensionsSubLabelBadExtensionsOffPlural",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_PLURAL},
-      {"safetyCheckExtensionsSubLabelManagedByAdminSingular",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_MANAGED_BY_ADMIN_SINGULAR},
-      {"safetyCheckExtensionsSubLabelManagedByAdminPlural",
-       IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_MANAGED_BY_ADMIN_PLURAL},
       {"safetyCheckExtensionsButton",
        IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON},
   };