[Merge] User Person/People instead of User/Users everywhere profile related.

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 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/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 175 matching lines @@
     template_url_service_->RemoveObserver(this);
   // There may be pending file dialogs, we need to tell them that we've gone
   // away so they don't try and call back to us.
   if (select_folder_dialog_.get())
     select_folder_dialog_->ListenerDestroyed();
 }
 
 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
   DCHECK(values);
 
-  const bool using_new_profiles_ui = switches::IsNewAvatarMenu();
-
 #if defined(OS_CHROMEOS)
   const int device_type_resource_id = chromeos::GetChromeDeviceTypeResourceId();
 #else
   // TODO(isherman): Set an appropriate device name for non-ChromeOS devices.
   const int device_type_resource_id = IDS_EASY_UNLOCK_GENERIC_DEVICE_TYPE;
 #endif  // defined(OS_CHROMEOS)
 
   static OptionsStringResource resources[] = {
     { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
     { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
@@ skipping 80 matching lines @@
     { "networkPredictionEnabledDescription",
       IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
     { "passwordsAndAutofillGroupName",
       IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
     { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
     { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
     { "privacyContentSettingsButton",
       IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
     { "profileAddPersonEnable", IDS_PROFILE_ADD_PERSON_ENABLE },
     { "profileBrowserGuestEnable", IDS_PROFILE_BROWSER_GUEST_ENABLE },
-    { "profilesCreate", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_CREATE_BUTTON_LABEL :
-          IDS_PROFILES_CREATE_BUTTON_LABEL },
-    { "profilesDelete", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_DELETE_BUTTON_LABEL :
-          IDS_PROFILES_DELETE_BUTTON_LABEL },
-    { "profilesDeleteSingle", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL :
-          IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
+    { "profilesCreate", IDS_NEW_PROFILES_CREATE_BUTTON_LABEL },
+    { "profilesDelete", IDS_NEW_PROFILES_DELETE_BUTTON_LABEL },
+    { "profilesDeleteSingle", IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
     { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
     { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
     { "profilesSupervisedDashboardTip",
       IDS_PROFILES_SUPERVISED_USER_DASHBOARD_TIP },
 #if defined(ENABLE_SETTINGS_APP)
     { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
 #endif
     { "proxiesLabelExtension", IDS_OPTIONS_EXTENSION_PROXIES_LABEL },
     { "proxiesLabelSystem", IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
       IDS_PRODUCT_NAME },
     { "resetProfileSettings", IDS_RESET_PROFILE_SETTINGS_BUTTON },
     { "resetProfileSettingsDescription",
       IDS_RESET_PROFILE_SETTINGS_DESCRIPTION },
     { "resetProfileSettingsSectionTitle",
       IDS_RESET_PROFILE_SETTINGS_SECTION_TITLE },
     { "safeBrowsingEnableProtection",
       IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
     { "safeBrowsingEnableExtendedReporting",
       IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING },
     { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
     { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
-    { "sectionTitleUsers", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_OPTIONS_GROUP_NAME :
-          IDS_PROFILES_OPTIONS_GROUP_NAME },
+    { "sectionTitleUsers", IDS_NEW_PROFILES_OPTIONS_GROUP_NAME },
     { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME },
     { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
     { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
     { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
     { "sectionTitleVoice", IDS_OPTIONS_VOICE_GROUP_NAME },
     { "settingsTitle", IDS_SETTINGS_TITLE },
     { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS },
     { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
     { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
     { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE },
@@ skipping 299 matching lines @@
 #endif
 
   values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());
 
   values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
 
   values->SetBoolean("websiteSettingsManagerEnabled",
                      CommandLine::ForCurrentProcess()->HasSwitch(
                          switches::kEnableWebsiteSettingsManager));
 
-  values->SetBoolean("usingNewProfilesUI", using_new_profiles_ui);
+  values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
 }
 
 #if defined(ENABLE_FULL_PRINTING)
 void BrowserOptionsHandler::RegisterCloudPrintValues(
     base::DictionaryValue* values) {
   values->SetString("cloudPrintOptionLabel",
                     l10n_util::GetStringFUTF16(
                         IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
                         l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
 }
@@ skipping 1315 matching lines @@
 
 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
                                                         bool disabled) {
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setMetricsReportingCheckboxState",
       base::FundamentalValue(checked),
       base::FundamentalValue(disabled));
 }
 
 }  // namespace options