| 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 68df1d0e137e7096512ce6348e1254dc52ff2062..e0407afaae25b0bcced06ea8baf62cd31f746c7b 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -415,7 +415,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
|
| { "autoclickDelayVeryShort",
|
| IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
|
| - { "batteryButton", IDS_OPTIONS_SETTINGS_BATTERY_DESCRIPTION},
|
| { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
|
| { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
|
| { "consumerManagementDescription",
|
| @@ -457,7 +456,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION },
|
| { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME },
|
| { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
|
| - { "storageButton", IDS_OPTIONS_SETTINGS_STORAGE_DESCRIPTION},
|
| { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
|
| { "thirdPartyImeConfirmDisable", IDS_CANCEL },
|
| { "thirdPartyImeConfirmEnable", IDS_OK },
|
| @@ -665,10 +663,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
|
|
| values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
|
|
|
| - values->SetBoolean("websiteSettingsManagerEnabled",
|
| - base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableWebsiteSettingsManager));
|
| -
|
| values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|