Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7989)

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2441503002: [MD Settings][People] Visual updates to the sync setup page. (Closed)
Patch Set: Addressed comment Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 396948d604916b851a8b4e3f5a36c656f03ee1fa..bc9ade9ea079bdf8fc6d05f3d9f6db1c6976ca9b 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
@@ -1074,12 +1074,7 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {
{"syncDataEncryptedText", IDS_SETTINGS_SYNC_DATA_ENCRYPTED_TEXT},
{"encryptWithGoogleCredentialsLabel",
IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL},
- {"encryptWithSyncPassphraseLabel",
- IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LABEL},
- {"encryptWithSyncPassphraseLearnMoreLink",
- IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LEARN_MORE_LINK},
{"useDefaultSettingsButton", IDS_SETTINGS_USE_DEFAULT_SETTINGS},
- {"passphraseExplanationText", IDS_SETTINGS_PASSPHRASE_EXPLANATION_TEXT},
{"emptyPassphraseError", IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR},
{"mismatchedPassphraseError", IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR},
{"incorrectPassphraseError", IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR},
@@ -1106,17 +1101,34 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {
html_source->AddString("supervisedUsersUrl",
chrome::kLegacySupervisedUserManagementURL);
+ html_source->AddString(
+ "encryptWithSyncPassphraseLabel",
+ l10n_util::GetStringFUTF8(
+ IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LABEL,
+ base::ASCIIToUTF16(chrome::kSyncEncryptionHelpURL)));
+
std::string sync_dashboard_url =
google_util::AppendGoogleLocaleParam(
GURL(chrome::kSyncGoogleDashboardURL),
g_browser_process->GetApplicationLocale())
.spec();
html_source->AddString("syncDashboardUrl", sync_dashboard_url);
+
+ html_source->AddString(
+ "passphraseExplanationText",
+ l10n_util::GetStringFUTF8(IDS_SETTINGS_PASSPHRASE_EXPLANATION_TEXT,
+ base::ASCIIToUTF16(sync_dashboard_url)));
+ html_source->AddString(
+ "passphraseResetHint",
+ l10n_util::GetStringFUTF8(IDS_SETTINGS_PASSPHRASE_RESET_HINT,
+ base::ASCIIToUTF16(sync_dashboard_url)));
html_source->AddString(
"passphraseRecover",
l10n_util::GetStringFUTF8(IDS_SETTINGS_PASSPHRASE_RECOVER,
base::ASCIIToUTF16(sync_dashboard_url)));
+ html_source->AddString("syncErrorHelpUrl", chrome::kSyncErrorsHelpURL);
+
html_source->AddString("activityControlsUrl",
chrome::kGoogleAccountActivityControlsURL);
}
« no previous file with comments | « chrome/browser/resources/settings/people_page/sync_page.js ('k') | chrome/browser/ui/webui/settings/people_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698