| 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 79d24f3cf849d61371349c0e157c2483120750d6..3fae86dda2fc5ca787d7327879e992e6729ccd91 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -243,12 +243,16 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
|
| { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
|
| { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },
|
| -#if !defined(OS_CHROMEOS)
|
| - { "easyUnlockCheckboxLabel", IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL },
|
| -#endif
|
| + { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION },
|
| { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE },
|
| { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON },
|
| - { "easyUnlockManagement", IDS_OPTIONS_EASY_UNLOCK_MANAGEMENT },
|
| + { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO },
|
| + { "easyUnlockTurnOffButton", IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_BUTTON },
|
| + { "easyUnlockTurnOffTitle", IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_TITLE },
|
| + { "easyUnlockTurnOffDescription",
|
| + IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_DESCRIPTION },
|
| + { "easyUnlockClearServerDataLabel",
|
| + IDS_OPTIONS_EASY_UNLOCK_CLEAR_SERVER_DATA_LABEL },
|
| { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED },
|
| { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE },
|
| { "fontSettingsCustomizeFontsButton",
|
| @@ -606,14 +610,8 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| "easyUnlockAllowed",
|
| EasyUnlockService::Get(Profile::FromWebUI(web_ui()))->IsAllowed());
|
| values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl);
|
| - values->SetString("easyUnlockManagementURL",
|
| - chrome::kEasyUnlockManagementUrl);
|
| -#if defined(OS_CHROMEOS)
|
| - values->SetString("easyUnlockCheckboxLabel",
|
| - l10n_util::GetStringFUTF16(
|
| - IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS,
|
| - chromeos::GetChromeDeviceType()));
|
|
|
| +#if defined(OS_CHROMEOS)
|
| values->SetBoolean(
|
| "consumerManagementEnabled",
|
| CommandLine::ForCurrentProcess()->HasSwitch(
|
| @@ -1790,6 +1788,7 @@ void BrowserOptionsHandler::SetupManagingSupervisedUsers() {
|
| }
|
|
|
| void BrowserOptionsHandler::SetupEasyUnlock() {
|
| + // TODO(xiyuan): Update when pairing data is really availble.
|
| bool has_pairing = !Profile::FromWebUI(web_ui())->GetPrefs()
|
| ->GetDictionary(prefs::kEasyUnlockPairing)->empty();
|
| base::FundamentalValue has_pairing_value(has_pairing);
|
|
|