| 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 db79cc2181b4c5821d0c023cc6bedbf91e234e98..bd557cb38f2e6d61a0958b082b7574e666924a79 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -340,7 +340,6 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
|
| IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
|
| { "accessibilityAlwaysShowMenu",
|
| IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU },
|
| - { "advancedSectionTitleKiosk", IDS_OPTIONS_KIOSK },
|
| { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
|
| { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
|
| { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
|
| @@ -358,7 +357,6 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
|
| { "keyboardSettingsButtonTitle",
|
| IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE },
|
| { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE },
|
| - { "manageKioskAppsButton", IDS_OPTIONS_KIOSK_MANAGE_BUTTON },
|
| { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
|
| { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME },
|
| { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
|
| @@ -474,16 +472,6 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
|
| magnifier_list->Append(option_partial.release());
|
|
|
| values->Set("magnifierList", magnifier_list.release());
|
| -
|
| - // Sets flag of whether kiosk section should be enabled.
|
| - values->SetBoolean(
|
| - "enableKioskSection",
|
| - CommandLine::ForCurrentProcess()->HasSwitch(
|
| - chromeos::switches::kEnableKioskAppSettings) &&
|
| - !CommandLine::ForCurrentProcess()->HasSwitch(
|
| - chromeos::switches::kDisableAppMode) &&
|
| - (chromeos::UserManager::Get()->IsCurrentUserOwner() ||
|
| - !base::chromeos::IsRunningOnChromeOS()));
|
| #endif
|
|
|
| #if defined(OS_MACOSX)
|
|
|