Settings People Rewrite: Make Sync/Sign-in naming consistent to People.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h"
@@ skipping 414 matching lines @@
       "passwordsAndAutofillPageTitle",
       IDS_SETTINGS_PASSWORDS_AND_AUTOFILL_PAGE_TITLE);
   html_source->AddLocalizedString("autofill", IDS_SETTINGS_AUTOFILL);
   html_source->AddLocalizedString("autofillDetail",
                                   IDS_SETTINGS_AUTOFILL_DETAIL);
   html_source->AddLocalizedString("passwords", IDS_SETTINGS_PASSWORDS);
   html_source->AddLocalizedString("passwordsDetail",
                                   IDS_SETTINGS_PASSWORDS_DETAIL);
 }
 
+void AddPeopleStrings(content::WebUIDataSource* html_source) {
+  html_source->AddLocalizedString("peoplePageTitle", IDS_SETTINGS_PEOPLE);
+  html_source->AddLocalizedString("manageOtherPeople",
+                                  IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE);
+  html_source->AddLocalizedString("syncOverview", IDS_SETTINGS_SYNC_OVERVIEW);
+  html_source->AddLocalizedString("syncSignin", IDS_SETTINGS_SYNC_SIGNIN);
+  html_source->AddLocalizedString("syncDisconnect",
+                                  IDS_SETTINGS_SYNC_DISCONNECT);
+  html_source->AddLocalizedString("syncDisconnectTitle",
+                                  IDS_SETTINGS_SYNC_DISCONNECT_TITLE);
+  std::string disconnect_help_url =
+      google_util::AppendGoogleLocaleParam(
+          GURL(chrome::kSyncGoogleDashboardURL),
+          g_browser_process->GetApplicationLocale())
+          .spec();
+  html_source->AddString(
+      "syncDisconnectExplanation",
+      l10n_util::GetStringFUTF16(IDS_SETTINGS_SYNC_DISCONNECT_EXPLANATION,
+                                 base::ASCIIToUTF16(disconnect_help_url)));
+  html_source->AddLocalizedString("syncDisconnectDeleteProfile",
+                                  IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE);
+  html_source->AddLocalizedString("syncDisconnectConfirm",
+                                  IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM);
+
+  html_source->AddLocalizedString("syncPageTitle", IDS_SETTINGS_SYNC);
+  html_source->AddLocalizedString("syncLoading", IDS_SETTINGS_SYNC_LOADING);
+  html_source->AddLocalizedString("syncTimeout", IDS_SETTINGS_SYNC_TIMEOUT);
+  html_source->AddLocalizedString("syncEverythingCheckboxLabel",
+                                  IDS_SETTINGS_SYNC_EVERYTHING_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("appCheckboxLabel",
+                                  IDS_SETTINGS_APPS_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("extensionsCheckboxLabel",
+                                  IDS_SETTINGS_EXTENSIONS_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("settingsCheckboxLabel",
+                                  IDS_SETTINGS_SETTINGS_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("autofillCheckboxLabel",
+                                  IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("historyCheckboxLabel",
+                                  IDS_SETTINGS_HISTORY_CHECKBOX_LABEL);
+  html_source->AddLocalizedString(
+      "themesAndWallpapersCheckboxLabel",
+      IDS_SETTINGS_THEMES_AND_WALLPAPERS_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("bookmarksCheckboxLabel",
+                                  IDS_SETTINGS_BOOKMARKS_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("passwordsCheckboxLabel",
+                                  IDS_SETTINGS_PASSWORDS_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("openTabsCheckboxLabel",
+                                  IDS_SETTINGS_OPEN_TABS_CHECKBOX_LABEL);
+  html_source->AddLocalizedString("encryptionOptionsTitle",
+                                  IDS_SETTINGS_ENCRYPTION_OPTIONS);
+  html_source->AddLocalizedString("syncDataEncryptedText",
+                                  IDS_SETTINGS_SYNC_DATA_ENCRYPTED_TEXT);
+  html_source->AddLocalizedString(
+      "encryptWithGoogleCredentialsLabel",
+      IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL);
+  html_source->AddLocalizedString(
+      "encryptWithSyncPassphraseLabel",
+      IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LABEL);
+  html_source->AddLocalizedString(
+      "encryptWithSyncPassphraseLearnMoreLink",
+      IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LEARN_MORE_LINK);
+  html_source->AddLocalizedString("useDefaultSettingsButton",
+                                  IDS_SETTINGS_USE_DEFAULT_SETTINGS_BUTTON);
+  // TODO(dpapad): Remove this string and use IDS_CANCEL (see AddCommonStrings
+  // at the top of this file).
+  html_source->AddLocalizedString("cancelButton", IDS_SETTINGS_CANCEL_BUTTON);
+  html_source->AddLocalizedString("okButton", IDS_SETTINGS_OK_BUTTON);
+  html_source->AddLocalizedString("passphraseExplanationText",
+                                  IDS_SETTINGS_PASSPHRASE_EXPLANATION_TEXT);
+  html_source->AddLocalizedString("emptyPassphraseError",
+                                  IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR);
+  html_source->AddLocalizedString("mismatchedPassphraseError",
+                                  IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR);
+  html_source->AddLocalizedString("incorrectPassphraseError",
+                                  IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR);
+  html_source->AddLocalizedString("passphrasePlaceholder",
+                                  IDS_SETTINGS_PASSPHRASE_PLACEHOLDER);
+  html_source->AddLocalizedString(
+      "passphraseConfirmationPlaceholder",
+      IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER);
+}
+
 void AddPrivacyStrings(content::WebUIDataSource* html_source) {
   html_source->AddLocalizedString("privacyPageTitle",
                                   IDS_SETTINGS_PRIVACY);
   html_source->AddString("improveBrowsingExperience",
                          l10n_util::GetStringFUTF16(
                              IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE,
                              base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL)));
   html_source->AddLocalizedString("linkDoctorPref",
                                   IDS_SETTINGS_LINKDOCTOR_PREF);
   html_source->AddLocalizedString("searchSuggestPref",
@@ skipping 134 matching lines @@
   html_source->AddLocalizedString("siteSettingsUsage",
                                   IDS_SETTINGS_SITE_SETTINGS_USAGE);
   html_source->AddLocalizedString("siteSettingsPermissions",
                                   IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS);
   html_source->AddLocalizedString("siteSettingsClearAndReset",
                                   IDS_SETTINGS_SITE_SETTINGS_CLEAR_BUTTON);
   html_source->AddLocalizedString("siteSettingsDelete",
                                   IDS_SETTINGS_SITE_SETTINGS_DELETE);
 }
 
-void AddSyncStrings(content::WebUIDataSource* html_source) {
-  html_source->AddLocalizedString("peoplePageTitle", IDS_SETTINGS_SYNC_PEOPLE);
-  html_source->AddLocalizedString("syncOverview", IDS_SETTINGS_SYNC_OVERVIEW);
-  html_source->AddLocalizedString("syncSignin", IDS_SETTINGS_SYNC_SIGNIN);
-  html_source->AddLocalizedString("syncDisconnect",
-                                  IDS_SETTINGS_SYNC_DISCONNECT);
-  html_source->AddLocalizedString("syncDisconnectTitle",
-                                  IDS_SETTINGS_SYNC_DISCONNECT_TITLE);
-  std::string disconnect_help_url =
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kSyncGoogleDashboardURL),
-          g_browser_process->GetApplicationLocale())
-          .spec();
-  html_source->AddString(
-      "syncDisconnectExplanation",
-      l10n_util::GetStringFUTF16(IDS_SETTINGS_SYNC_DISCONNECT_EXPLANATION,
-                                 base::ASCIIToUTF16(disconnect_help_url)));
-  html_source->AddLocalizedString("syncDisconnectDeleteProfile",
-                                  IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE);
-  html_source->AddLocalizedString("syncDisconnectConfirm",
-                                  IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM);
-  html_source->AddLocalizedString("manageOtherPeople",
-                                  IDS_SETTINGS_SYNC_MANAGE_OTHER_PEOPLE);
-
-  html_source->AddLocalizedString("syncPageTitle", IDS_SETTINGS_SYNC);
-  html_source->AddLocalizedString("syncLoading", IDS_SETTINGS_SYNC_LOADING);
-  html_source->AddLocalizedString("syncTimeout", IDS_SETTINGS_SYNC_TIMEOUT);
-  html_source->AddLocalizedString("syncEverythingCheckboxLabel",
-                                  IDS_SETTINGS_SYNC_EVERYTHING_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("appCheckboxLabel",
-                                  IDS_SETTINGS_APPS_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("extensionsCheckboxLabel",
-                                  IDS_SETTINGS_EXTENSIONS_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("settingsCheckboxLabel",
-                                  IDS_SETTINGS_SETTINGS_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("autofillCheckboxLabel",
-                                  IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("historyCheckboxLabel",
-                                  IDS_SETTINGS_HISTORY_CHECKBOX_LABEL);
-  html_source->AddLocalizedString(
-      "themesAndWallpapersCheckboxLabel",
-      IDS_SETTINGS_THEMES_AND_WALLPAPERS_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("bookmarksCheckboxLabel",
-                                  IDS_SETTINGS_BOOKMARKS_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("passwordsCheckboxLabel",
-                                  IDS_SETTINGS_PASSWORDS_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("openTabsCheckboxLabel",
-                                  IDS_SETTINGS_OPEN_TABS_CHECKBOX_LABEL);
-  html_source->AddLocalizedString("encryptionOptionsTitle",
-                                  IDS_SETTINGS_ENCRYPTION_OPTIONS);
-  html_source->AddLocalizedString("syncDataEncryptedText",
-                                  IDS_SETTINGS_SYNC_DATA_ENCRYPTED_TEXT);
-  html_source->AddLocalizedString(
-      "encryptWithGoogleCredentialsLabel",
-      IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL);
-  html_source->AddLocalizedString(
-      "encryptWithSyncPassphraseLabel",
-      IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LABEL);
-  html_source->AddLocalizedString(
-      "encryptWithSyncPassphraseLearnMoreLink",
-      IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LEARN_MORE_LINK);
-  html_source->AddLocalizedString("useDefaultSettingsButton",
-                                  IDS_SETTINGS_USE_DEFAULT_SETTINGS_BUTTON);
-  // TODO(dpapad): Remove this string and use IDS_CANCEL (see AddCommonStrings
-  // at the top of this file).
-  html_source->AddLocalizedString("cancelButton",
-                                  IDS_SETTINGS_CANCEL_BUTTON);
-  html_source->AddLocalizedString("okButton",
-                                  IDS_SETTINGS_OK_BUTTON);
-  html_source->AddLocalizedString("passphraseExplanationText",
-                                  IDS_SETTINGS_PASSPHRASE_EXPLANATION_TEXT);
-  html_source->AddLocalizedString("emptyPassphraseError",
-                                  IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR);
-  html_source->AddLocalizedString("mismatchedPassphraseError",
-                                  IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR);
-  html_source->AddLocalizedString("incorrectPassphraseError",
-                                  IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR);
-  html_source->AddLocalizedString("passphrasePlaceholder",
-                                  IDS_SETTINGS_PASSPHRASE_PLACEHOLDER);
-  html_source->AddLocalizedString(
-      "passphraseConfirmationPlaceholder",
-      IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER);
-}
-
 void AddUsersStrings(content::WebUIDataSource* html_source) {
   html_source->AddLocalizedString("usersPageTitle",
                                   IDS_SETTINGS_USERS);
   html_source->AddLocalizedString("usersModifiedByOwnerLabel",
                                   IDS_SETTINGS_USERS_MODIFIED_BY_OWNER_LABEL);
   html_source->AddLocalizedString("guestBrowsingLabel",
                                   IDS_SETTINGS_USERS_GUEST_BROWSING_LABEL);
   html_source->AddLocalizedString("settingsManagedLabel",
                                   IDS_SETTINGS_USERS_MANAGED_LABEL);
   html_source->AddLocalizedString("supervisedUsersLabel",
@@ skipping 63 matching lines @@
   AddDownloadsStrings(html_source);
 #if defined(OS_CHROMEOS)
   AddInternetStrings(html_source);
 #endif
   AddLanguagesStrings(html_source);
 #if defined(OS_CHROMEOS)
   AddMultiProfilesStrings(html_source, profile);
 #endif
   AddOnStartupStrings(html_source);
   AddPasswordsAndFormsStrings(html_source);
+  AddPeopleStrings(html_source);
   AddPrivacyStrings(html_source);
   AddResetStrings(html_source);
   AddSearchEnginesStrings(html_source);
   AddSearchStrings(html_source);
   AddSiteSettingsStrings(html_source);
-  AddSyncStrings(html_source);
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings