Add quick unlock Settings in options page

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 <stddef.h>
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/number_formatting.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/settings_api_helpers.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
@@ skipping 82 matching lines @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/accessibility_types.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/shell.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/reset/metrics.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
@@ skipping 90 matching lines @@
   DCHECK(values);
 
 #if defined(OS_CHROMEOS)
   const int device_type_resource_id = ash::GetChromeOSDeviceTypeResourceId();
 #else
   const int device_type_resource_id = IDS_EASY_UNLOCK_GENERIC_DEVICE_TYPE;
 #endif  // defined(OS_CHROMEOS)
 
   static OptionsStringResource resources[] = {
     // Please keep these in alphabetical order.
-    { "accessibilityFeaturesLink", IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK },
-    { "accessibilityTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
-    { "advancedSectionTitleCertificates",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES },
-    { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
-    { "advancedSectionTitleContent",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
-    { "advancedSectionTitleLanguages",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES },
-    { "advancedSectionTitleNetwork",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK },
-    { "advancedSectionTitlePrivacy",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY },
-    { "advancedSectionTitleSystem", IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM },
-    { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY },
-    { "autoOpenFileTypesResetToDefault",
-      IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT },
-    { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE },
-    { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN },
-    { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON },
-    { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
-    { "childLabel", IDS_PROFILES_LIST_CHILD_LABEL },
-    { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
-    { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL },
-    { "defaultBrowserUnknown",
-      IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, IDS_PRODUCT_NAME },
-    { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT },
-    { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
-    { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
-    { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
-    { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
-    { "doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK },
-    { "doNotTrackConfirmDisable",
-      IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE },
-    { "doNotTrackConfirmEnable",
-      IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE },
-    { "doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT },
-    { "downloadLocationAskForSaveLocation",
-      IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION },
-    { "downloadLocationBrowseTitle",
-      IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE },
-    { "downloadLocationChangeButton",
-      IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON },
-    { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
-    { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION,
-      device_type_resource_id },
-    { "easyUnlockRequireProximityLabel",
-      IDS_OPTIONS_EASY_UNLOCK_REQUIRE_PROXIMITY_LABEL,
-      device_type_resource_id },
-    { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE },
-    { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON },
-    { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO,
-      device_type_resource_id },
-    { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
-    { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED },
-    { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE },
-    { "fontSettingsCustomizeFontsButton",
-      IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON },
-    { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM },
-    { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE },
-    { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM },
-    { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL },
-    { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE },
-    { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL },
-    { "googleNowLauncherEnable", IDS_OPTIONS_ENABLE_GOOGLE_NOW },
-    { "hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS },
-    { "homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP },
-    { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
-    { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
-    { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
-    { "hotwordAlwaysOnAudioHistoryDescription",
-      IDS_HOTWORD_ALWAYS_ON_AUDIO_HISTORY_DESCRIPTION },
-    { "hotwordAlwaysOnDesc", IDS_HOTWORD_SEARCH_ALWAYS_ON_DESCRIPTION },
-    { "hotwordAudioHistoryManage", IDS_HOTWORD_AUDIO_HISTORY_MANAGE_LINK },
-    { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE },
-    { "hotwordConfirmDisable", IDS_HOTWORD_CONFIRM_BUBBLE_DISABLE },
-    { "hotwordConfirmEnable", IDS_HOTWORD_CONFIRM_BUBBLE_ENABLE },
-    { "hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION },
-    { "hotwordNoDSPDesc", IDS_HOTWORD_SEARCH_NO_DSP_DESCRIPTION },
-    { "hotwordRetrainLink", IDS_HOTWORD_RETRAIN_LINK },
-    { "hotwordSearchEnable", IDS_HOTWORD_SEARCH_PREF_CHKBOX },
-    { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
-    { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
-    { "languageAndSpellCheckSettingsButton",
-      IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS },
+    {"accessibilityFeaturesLink", IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK},
+    {"accessibilityTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY},
+    {"advancedSectionTitleCertificates",
+     IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES},
+    {"advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT},
+    {"advancedSectionTitleContent", IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT},
+    {"advancedSectionTitleLanguages",
+     IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES},
+    {"advancedSectionTitleNetwork", IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK},
+    {"advancedSectionTitlePrivacy", IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY},
+    {"advancedSectionTitleSystem", IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM},
+    {"autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY},
+    {"autoOpenFileTypesResetToDefault",
+     IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT},
+    {"autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE},
+    {"autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN},
+    {"certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON},
+    {"changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE},
+    {"childLabel", IDS_PROFILES_LIST_CHILD_LABEL},
+    {"currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY},
+    {"customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL},
+    {"defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
+     IDS_PRODUCT_NAME},
+    {"defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT},
+    {"defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL},
+    {"defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES},
+    {"defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL},
+    {"disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES},
+    {"doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK},
+    {"doNotTrackConfirmDisable",
+     IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE},
+    {"doNotTrackConfirmEnable", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE},
+    {"doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT},
+    {"downloadLocationAskForSaveLocation",
+     IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION},
+    {"downloadLocationBrowseTitle", IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE},
+    {"downloadLocationChangeButton",
+     IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON},
+    {"downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME},
+    {"easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION,
+     device_type_resource_id},
+    {"easyUnlockRequireProximityLabel",
+     IDS_OPTIONS_EASY_UNLOCK_REQUIRE_PROXIMITY_LABEL, device_type_resource_id},
+    {"easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE},
+    {"easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON},
+    {"easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO,
+     device_type_resource_id},
+    {"enableLogging", IDS_OPTIONS_ENABLE_LOGGING},
+    {"extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED},
+    {"extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE},
+    {"fontSettingsCustomizeFontsButton",
+     IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON},
+    {"fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM},
+    {"fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE},
+    {"fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM},
+    {"fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL},
+    {"fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE},
+    {"fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL},
+    {"googleNowLauncherEnable", IDS_OPTIONS_ENABLE_GOOGLE_NOW},
+    {"hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS},
+    {"homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP},
+    {"homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON},
+    {"homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB},
+    {"homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL},
+    {"hotwordAlwaysOnAudioHistoryDescription",
+     IDS_HOTWORD_ALWAYS_ON_AUDIO_HISTORY_DESCRIPTION},
+    {"hotwordAlwaysOnDesc", IDS_HOTWORD_SEARCH_ALWAYS_ON_DESCRIPTION},
+    {"hotwordAudioHistoryManage", IDS_HOTWORD_AUDIO_HISTORY_MANAGE_LINK},
+    {"hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE},
+    {"hotwordConfirmDisable", IDS_HOTWORD_CONFIRM_BUBBLE_DISABLE},
+    {"hotwordConfirmEnable", IDS_HOTWORD_CONFIRM_BUBBLE_ENABLE},
+    {"hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION},
+    {"hotwordNoDSPDesc", IDS_HOTWORD_SEARCH_NO_DSP_DESCRIPTION},
+    {"hotwordRetrainLink", IDS_HOTWORD_RETRAIN_LINK},
+    {"hotwordSearchEnable", IDS_HOTWORD_SEARCH_PREF_CHKBOX},
+    {"importData", IDS_OPTIONS_IMPORT_DATA_BUTTON},
+    {"improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE},
+    {"languageAndSpellCheckSettingsButton",
+     IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS},
 #if defined(OS_CHROMEOS)
-    { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
-      IDS_SHORT_PRODUCT_OS_NAME },
+    {"languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
+     IDS_SHORT_PRODUCT_OS_NAME},
 #else
     { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
       IDS_SHORT_PRODUCT_NAME },
 #endif
-    { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
-    { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
-    { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES },
-    { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
-    { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },
-    { "networkPredictionEnabledDescription",
-      IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
-    { "passwordManagerEnabled", GetPasswordManagerSettingsStringId(
-        ProfileSyncServiceFactory::GetForProfile(Profile::FromWebUI(web_ui())))
-    },
-    { "passwordsAndAutofillGroupName",
-      IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
-    { "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", IDS_PROFILES_CREATE_BUTTON_LABEL },
-    { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
-    { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
-    { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
-    { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
-    { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
-      IDS_PRODUCT_NAME },
-    { "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 },
-    { "safeBrowsingEnableExtendedReporting",
-      IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING },
-    { "safeBrowsingEnableProtection",
-      IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
-    { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
-    { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_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 },
-    { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
-    { "settingsTitle", IDS_SETTINGS_TITLE },
-    { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS },
-    { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE },
-    { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
-    { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
-    { "spellingPref", IDS_OPTIONS_SPELLING_PREF },
-    { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
-    { "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES },
-    { "startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB },
-    { "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES },
-    { "suggestPref", IDS_OPTIONS_SUGGEST_PREF },
-    { "supervisedUserLabel", IDS_PROFILES_LIST_LEGACY_SUPERVISED_USER_LABEL },
-    { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS },
-    { "syncButtonTextSignIn", IDS_SYNC_START_SYNC_BUTTON_LABEL,
-      IDS_SHORT_PRODUCT_NAME },
-    { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL },
-    { "syncOverview", IDS_SYNC_OVERVIEW },
-    { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF },
-    { "themesGallery", IDS_THEMES_GALLERY_BUTTON },
-    { "themesGalleryURL", IDS_THEMES_GALLERY_URL },
-    { "themesReset", IDS_THEMES_RESET_BUTTON },
-    { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR },
-    { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
-    { "translateEnableTranslate",
-      IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
+    {"linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF},
+    {"manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK},
+    {"manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES},
+    {"managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK},
+    {"metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART},
+    {"networkPredictionEnabledDescription",
+     IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION},
+    {"passwordManagerEnabled", GetPasswordManagerSettingsStringId(
+                                   ProfileSyncServiceFactory::GetForProfile(
+                                       Profile::FromWebUI(web_ui())))},
+    {"passwordsAndAutofillGroupName",
+     IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME},
+    {"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", IDS_PROFILES_CREATE_BUTTON_LABEL},
+    {"profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL},
+    {"profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL},
+    {"profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT},
+    {"profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL},
+    {"profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE, IDS_PRODUCT_NAME},
+    {"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},
+    {"safeBrowsingEnableExtendedReporting",
+     IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING},
+    {"safeBrowsingEnableProtection", IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION},
+    {"sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME},
+    {"sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_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},
+    {"sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME},
+    {"settingsTitle", IDS_SETTINGS_TITLE},
+    {"showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS},
+    {"spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE},
+    {"spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE},
+    {"spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT},
+    {"spellingPref", IDS_OPTIONS_SPELLING_PREF},
+    {"startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION},
+    {"startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES},
+    {"startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB},
+    {"startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES},
+    {"suggestPref", IDS_OPTIONS_SUGGEST_PREF},
+    {"supervisedUserLabel", IDS_PROFILES_LIST_LEGACY_SUPERVISED_USER_LABEL},
+    {"syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS},
+    {"syncButtonTextSignIn", IDS_SYNC_START_SYNC_BUTTON_LABEL,
+     IDS_SHORT_PRODUCT_NAME},
+    {"syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL},
+    {"syncOverview", IDS_SYNC_OVERVIEW},
+    {"tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF},
+    {"themesGallery", IDS_THEMES_GALLERY_BUTTON},
+    {"themesGalleryURL", IDS_THEMES_GALLERY_URL},
+    {"themesReset", IDS_THEMES_RESET_BUTTON},
+    {"toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR},
+    {"toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON},
+    {"translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE},
 #if defined(OS_CHROMEOS)
     { "accessibilityAlwaysShowMenu",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU },
     { "accessibilityAutoclick",

[jdufault, 2016/08/15 19:21:18]

Please keep style consistent; I'd revert the existing style changes.

[xiaoyinh(OOO Sep 11-29), 2016/08/16 17:33:43]

I have run the git cl format, hope this time it's ok.

        IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DESCRIPTION },
     { "accessibilityAutoclickDropdown",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DROPDOWN_DESCRIPTION },
     { "accessibilityCaretHighlight",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_CARET_HIGHLIGHT_DESCRIPTION },
     { "accessibilityCursorHighlight",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_CURSOR_HIGHLIGHT_DESCRIPTION },
     { "accessibilityExplanation",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION },
     { "accessibilityFocusHighlight",
@@ skipping 51 matching lines @@
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
     { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
     { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
     { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME },
     { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION },
     { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION },
     { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
     { "displayOptions", IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL },
     { "enableContentProtectionAttestation",
       IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION },
-    { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX },
+    { "manageScreenlock", IDS_OPTIONS_MANAGE_SCREENLOCKER },
     { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
     { "factoryResetDescription", IDS_OPTIONS_FACTORY_RESET_DESCRIPTION,
       IDS_SHORT_PRODUCT_NAME },
     { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
     { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL },
     { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
     { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
     { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING },
     { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE },
     { "keyboardSettingsButtonTitle",
       IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE },
     { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE },
     { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION },
     { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
-    { "powerSettingsButton",
-      IDS_OPTIONS_DEVICE_GROUP_POWER_SETTINGS_BUTTON },
-    { "resolveTimezoneByGeoLocation",
-      IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION },
-    { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME },
-    { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
-    { "storageManagerButtonTitle",
-      IDS_OPTIONS_DEVICE_GROUP_STORAGE_MANAGER_BUTTON_TITLE },
-    { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
-    { "thirdPartyImeConfirmDisable", IDS_CANCEL },
-    { "thirdPartyImeConfirmEnable", IDS_OK },
-    { "thirdPartyImeConfirmMessage",
-      IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE },
-    { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
-    { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION },
-    { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
-    { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION },
+    {"confirm", IDS_CONFIRM},
+    {"pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR},
+    {"configurePinChoosePinTitle",
+     IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE},
+    {"configurePinConfirmPinTitle",
+     IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE},
+    {"configurePinContinueButton",
+     IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON},
+    {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED},
+    {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT},
+    {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN},
+    {"lockScreenChangePinButton",
+     IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
+    {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
+    {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
+    {"lockScreenPinOrPassword",
+     IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
+    {"lockScreenSetupPinButton",
+     IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
+    {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
+    {"passwordPromptEnterPassword",
+     IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD},
+    {"passwordPromptInvalidPassword",
+     IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD},
+    {"passwordPromptPasswordLabel",
+     IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL},
+    {"passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE},
+    {"pinKeyboardPlaceholderPin", IDS_PIN_KEYBOARD_HINT_TEXT_PIN},
+    {"pinKeyboardPlaceholderPinPassword",
+     IDS_PIN_KEYBOARD_HINT_TEXT_PIN_PASSWORD},
+    {"powerSettingsButton", IDS_OPTIONS_DEVICE_GROUP_POWER_SETTINGS_BUTTON},
+    {"resolveTimezoneByGeoLocation",
+     IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION},
+    {"sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME},
+    {"sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL},
+    {"storageManagerButtonTitle",
+     IDS_OPTIONS_DEVICE_GROUP_STORAGE_MANAGER_BUTTON_TITLE},
+    {"syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL},
+    {"thirdPartyImeConfirmDisable", IDS_CANCEL},
+    {"thirdPartyImeConfirmEnable", IDS_OK},
+    {"thirdPartyImeConfirmMessage",
+     IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE},
+    {"timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION},
+    {"touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION},
+    {"use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION},
+    {"wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
 #else
     { "gpuModeCheckbox",
       IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE },
     { "gpuModeResetRestart",
       IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART },
     { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
     { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-    { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
-    { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
-    { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
+    {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
+    {"themesNativeButton", IDS_THEMES_GTK_BUTTON},
+    {"themesSetClassic", IDS_THEMES_SET_CLASSIC},
 #else
     { "themes", IDS_THEMES_GROUP_NAME },
 #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 
 #if defined(OS_CHROMEOS) && defined(USE_ASH)
-    { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
+    {"setWallpaper", IDS_SET_WALLPAPER_BUTTON},
 #endif  // defined(OS_CHROMEOS) && defined(USE_ASH)
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
-    { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE },
+    {"backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE},
 #endif  // defined(OS_MACOSX) && !defined(OS_CHROMEOS)
 
 #if defined(ENABLE_SERVICE_DISCOVERY)
-    { "cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON },
-    { "cloudPrintEnableNotificationsLabel",
-      IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL },
+    {"cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON},
+    {"cloudPrintEnableNotificationsLabel",
+     IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL},
 #endif  // defined(ENABLE_SERVICE_DISCOVERY)
   };
 
   RegisterStrings(values, resources, arraysize(resources));
   RegisterTitle(values, "doNotTrackConfirmOverlay",
                 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE);
   RegisterTitle(values, "spellingConfirmOverlay",
                 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE);
 #if defined(ENABLE_PRINT_PREVIEW)
   RegisterCloudPrintValues(values);
@@ skipping 161 matching lines @@
           chromeos::switches::kEnableExperimentalAccessibilityFeatures));
 
   chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
   bool allow_bluetooth = true;
   cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth);
   values->SetBoolean("allowBluetooth", allow_bluetooth);
 
   values->SetBoolean("enableStorageManager",
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableStorageManager));
+
+  values->SetBoolean("showQuickUnlockSettings",
+                     chromeos::IsQuickUnlockEnabled());
+  if (chromeos::IsQuickUnlockEnabled()) {
+    values->SetString(
+        "enableScreenlock",
+        l10n_util::GetStringUTF16(
+            IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX_WITH_QUICK_UNLOCK));
+  } else {
+    values->SetString(
+        "enableScreenlock",
+        l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX));
+  }
+  // Format numbers to be used on the pin keyboard.
+  for (int j = 0; j <= 9; j++) {
+    values->SetString("pinKeyboard" + base::IntToString(j),
+                      base::FormatNumber(int64_t{j}));
+  }
 #endif
 }
 
 #if defined(ENABLE_PRINT_PREVIEW)
 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 1461 matching lines @@
 
 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
 #if defined(OS_CHROMEOS)
   return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
 #else
   return true;
 #endif
 }
 
 }  // namespace options