Settings People Sync: Add 'Reset Sync' message for forgotten passphrase.

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

Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 185bb9e3c9c067e73daf40672933d98cfc65f215..09c43968d974b4c1eed2b70685272aa19cf6cf08 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -959,15 +959,20 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {
   html_source->AddString("autofillHelpURL", autofill::kHelpURL);
   html_source->AddString("supervisedUsersUrl",
                          chrome::kLegacySupervisedUserManagementURL);
-  std::string sync_dashboard_url =
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kSyncGoogleDashboardURL),
-          g_browser_process->GetApplicationLocale())
-          .spec();
+
+  base::string16 sync_dashboard_url =
+      base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
+                             GURL(chrome::kSyncGoogleDashboardURL),
+                             g_browser_process->GetApplicationLocale())
+                             .spec());
   html_source->AddString("syncDashboardUrl", sync_dashboard_url);

[dschuyler, 2016/08/18 01:09:29]

Sadly, sync_dashboard_url will be turned back
into a std::string in AddString().

https://cs.chromium.org/chromium/src/content/browser/webui/web_ui_data_source...

Dunno if this really matters, since it will need 
to be a utf16 for the GetStringFUTF16(). There may
be nothing to change here, but I thought I'd mention
it in case you had an idea how to avoid the conversions
back and forth.

[tommycli, 2016/08/18 16:23:31]

Done.

   html_source->AddString(
-      "activityControlsUrl",
-      base::ASCIIToUTF16(chrome::kGoogleAccountActivityControlsURL));
+      "passphraseRecover",
+      l10n_util::GetStringFUTF16(IDS_SETTINGS_PASSPHRASE_RECOVER,

[dschuyler, 2016/08/18 01:09:29]

Not a big deal, but this can be
l10n_util::GetStringFUTF8, which
will simply do the base::UTF16ToUTF8
here rather than in AddString(), but
imo it helps others see that the 
html is really utf8 (and not utf16).

[tommycli, 2016/08/18 16:23:31]

Done.

+                                 sync_dashboard_url));
+
+  html_source->AddString("activityControlsUrl",
+                         chrome::kGoogleAccountActivityControlsURL);
 }
 
 void AddPrintingStrings(content::WebUIDataSource* html_source) {