| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index f0366fd20ad3673aab4efc8d912db69c1ee02708..c745a6fa9e92b1ac7832b3bad8866fc3f6fd21c4 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -537,10 +537,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE },
|
| #endif // defined(OS_MACOSX) && !defined(OS_CHROMEOS)
|
|
|
| -#if defined(ENABLE_SETTINGS_APP)
|
| - { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
|
| -#endif // defined(ENABLE_SETTINGS_APP)
|
| -
|
| #if defined(ENABLE_SERVICE_DISCOVERY)
|
| { "cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON },
|
| { "cloudPrintEnableNotificationsLabel",
|
| @@ -548,23 +544,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| #endif // defined(ENABLE_SERVICE_DISCOVERY)
|
| };
|
|
|
| -#if defined(ENABLE_SETTINGS_APP)
|
| - static OptionsStringResource app_resources[] = {
|
| - { "syncOverview", IDS_SETTINGS_APP_SYNC_OVERVIEW },
|
| - { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL,
|
| - IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
|
| - { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
|
| - IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
|
| - { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
|
| - IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
|
| - { "proxiesLabelSystem", IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
|
| - IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
|
| - };
|
| - base::DictionaryValue* app_values = NULL;
|
| - CHECK(values->GetDictionary(kSettingsAppKey, &app_values));
|
| - RegisterStrings(app_values, app_resources, arraysize(app_resources));
|
| -#endif
|
| -
|
| RegisterStrings(values, resources, arraysize(resources));
|
| RegisterTitle(values, "doNotTrackConfirmOverlay",
|
| IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE);
|
|
|