Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Dedupe some code + propagate flags from JS Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/app_list/arc/arc_app_utils.cc ('K') | « chrome/browser/ui/ash/launcher/launcher_controller_helper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 08fdcf647721fab6bfd366aa2e3e89c7cd11188d..883d4acaa432ac64f049292798e36b63bfcb567b 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -118,9 +118,9 @@
#endif
#if defined(OS_CHROMEOS)
-#include "ash/common/accessibility_types.h" // nogncheck
+#include "ash/common/accessibility_types.h" // nogncheck
#include "ash/common/system/chromeos/devicetype_utils.h" // nogncheck
-#include "ash/shell.h" // nogncheck
+#include "ash/shell.h" // nogncheck
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
@@ -143,6 +143,7 @@
#include "components/arc/arc_bridge_service.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
+#include "ui/events/event_constants.h"
#include "ui/gfx/image/image_skia.h"
#endif // defined(OS_CHROMEOS)
@@ -252,336 +253,322 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
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", enable_logging_resource_id },
- { "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", enable_logging_resource_id},
+ {"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 },
+ {"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 },
- { "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},
+ {"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",
- 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",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION },
- { "accessibilityHighContrast",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION },
- { "accessibilityLargeCursor",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION },
- { "accessibilityScreenMagnifier",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION },
- { "accessibilityScreenMagnifierCenterFocus",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_CENTER_FOCUS },
- { "accessibilityScreenMagnifierFull",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL },
- { "accessibilityScreenMagnifierOff",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF },
- { "accessibilityScreenMagnifierPartial",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL },
- { "accessibilitySelectToSpeak",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DESCRIPTION },
- { "accessibilitySettings",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS },
- { "accessibilitySpokenFeedback",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION },
- { "accessibilityStickyKeys",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION },
- { "accessibilitySwitchAccess",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION },
- { "accessibilityTalkBackSettings",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TALKBACK_SETTINGS },
- { "accessibilityTapDragging",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
- { "accessibilityVirtualKeyboard",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
- { "accessibilityMonoAudio",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION},
- { "advancedSectionTitleCupsPrint",
- IDS_OPTIONS_ADVANCED_SECTION_TITLE_CUPS_PRINT },
- { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE },
- { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE },
- { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS },
- { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE },
- { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER },
- { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION },
- { "arcOptOutDialogButtonConfirmDisable",
- IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE },
- { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL },
- { "autoclickDelayExtremelyShort",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT },
- { "autoclickDelayLong",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG },
- { "autoclickDelayShort",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
- { "autoclickDelayVeryLong",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
- { "autoclickDelayVeryShort",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
- { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
- { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
- { "cupsPrintOptionLabel", IDS_OPTIONS_ADVANCED_SECTION_CUPS_PRINT_LABEL },
- { "cupsPrintersManageButton",
- IDS_OPTIONS_ADVANCED_SECTION_CUPS_PRINT_MANAGE_BUTTON },
- { "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 },
- { "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 },
- { "confirm", IDS_CONFIRM },
- { "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 },
- { "pinKeyboardDeleteAccessibleName",
- IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME },
- { "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 },
+ {"accessibilityAlwaysShowMenu",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU},
+ {"accessibilityAutoclick",
+ 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",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+ {"accessibilityHighContrast",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION},
+ {"accessibilityLargeCursor",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION},
+ {"accessibilityScreenMagnifier",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION},
+ {"accessibilityScreenMagnifierCenterFocus",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_CENTER_FOCUS},
+ {"accessibilityScreenMagnifierFull",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL},
+ {"accessibilityScreenMagnifierOff",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF},
+ {"accessibilityScreenMagnifierPartial",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL},
+ {"accessibilitySelectToSpeak",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DESCRIPTION},
+ {"accessibilitySettings", IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS},
+ {"accessibilitySpokenFeedback",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION},
+ {"accessibilityStickyKeys",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION},
+ {"accessibilitySwitchAccess",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION},
+ {"accessibilityTalkBackSettings",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TALKBACK_SETTINGS},
+ {"accessibilityTapDragging",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION},
+ {"accessibilityVirtualKeyboard",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION},
+ {"accessibilityMonoAudio",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION},
+ {"advancedSectionTitleCupsPrint",
+ IDS_OPTIONS_ADVANCED_SECTION_TITLE_CUPS_PRINT},
+ {"androidAppsTitle", IDS_OPTIONS_ARC_TITLE},
+ {"androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE},
+ {"androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS},
+ {"arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE},
+ {"arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER},
+ {"arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION},
+ {"arcOptOutDialogButtonConfirmDisable",
+ IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE},
+ {"arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL},
+ {"autoclickDelayExtremelyShort",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT},
+ {"autoclickDelayLong",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG},
+ {"autoclickDelayShort",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT},
+ {"autoclickDelayVeryLong",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG},
+ {"autoclickDelayVeryShort",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT},
+ {"changePicture", IDS_OPTIONS_CHANGE_PICTURE},
+ {"changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION},
+ {"cupsPrintOptionLabel", IDS_OPTIONS_ADVANCED_SECTION_CUPS_PRINT_LABEL},
+ {"cupsPrintersManageButton",
+ IDS_OPTIONS_ADVANCED_SECTION_CUPS_PRINT_MANAGE_BUTTON},
+ {"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},
+ {"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},
+ {"confirm", IDS_CONFIRM},
+ {"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},
+ {"pinKeyboardDeleteAccessibleName",
+ IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME},
+ {"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 },
+ {"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 },
+ {"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 BUILDFLAG(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
};
@@ -614,9 +601,9 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
base::string16 supervised_user_dashboard =
base::ASCIIToUTF16(chrome::kLegacySupervisedUserManagementURL);
values->SetString("profilesSupervisedDashboardTip",
- l10n_util::GetStringFUTF16(
- IDS_PROFILES_LEGACY_SUPERVISED_USER_DASHBOARD_TIP,
- supervised_user_dashboard));
+ l10n_util::GetStringFUTF16(
+ IDS_PROFILES_LEGACY_SUPERVISED_USER_DASHBOARD_TIP,
+ supervised_user_dashboard));
#if defined(OS_CHROMEOS)
std::string username = profile->GetProfileUserName();
@@ -651,11 +638,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
chrome::kChromeAccessibilityHelpURL);
std::string settings_url = std::string("chrome-extension://") +
- extension_misc::kChromeVoxExtensionId +
- chrome::kChromeAccessibilitySettingsURL;
+ extension_misc::kChromeVoxExtensionId +
+ chrome::kChromeAccessibilitySettingsURL;
- values->SetString("accessibilitySettingsURL",
- settings_url);
+ values->SetString("accessibilitySettingsURL", settings_url);
values->SetString("contentProtectionAttestationLearnMoreURL",
chrome::kAttestationForContentProtectionLearnMoreURL);
@@ -679,9 +665,11 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
#endif
#if defined(OS_MACOSX)
- values->SetString("macPasswordsWarning",
+ values->SetString(
+ "macPasswordsWarning",
l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
- values->SetBoolean("multiple_profiles",
+ values->SetBoolean(
+ "multiple_profiles",
g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
#endif
@@ -716,16 +704,15 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
!cloud_print::PrivetNotificationService::IsEnabled());
#endif
- values->SetBoolean("cloudPrintShowMDnsOptions",
- cloud_print_mdns_ui_enabled_);
+ values->SetBoolean("cloudPrintShowMDnsOptions", cloud_print_mdns_ui_enabled_);
values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL);
values->SetString("languagesLearnMoreURL",
chrome::kLanguageSettingsLearnMoreUrl);
- values->SetBoolean(
- "easyUnlockAllowed", EasyUnlockService::Get(profile)->IsAllowed());
+ values->SetBoolean("easyUnlockAllowed",
+ EasyUnlockService::Get(profile)->IsAllowed());
values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl);
values->SetBoolean("easyUnlockProximityDetectionAllowed",
base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -747,10 +734,11 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
values->SetBoolean(
"showWakeOnWifi",
chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() &&
- chromeos::switches::WakeOnWifiEnabled());
+ chromeos::switches::WakeOnWifiEnabled());
values->SetBoolean("enableTimeZoneTrackingOption",
!chromeos::system::HasSystemTimezonePolicy());
- values->SetBoolean("resolveTimezoneByGeolocationInitialValue",
+ values->SetBoolean(
+ "resolveTimezoneByGeolocationInitialValue",
profile->GetPrefs()->GetBoolean(prefs::kResolveTimezoneByGeolocation));
values->SetBoolean("enableLanguageOptionsImeMenu",
base::FeatureList::IsEnabled(features::kOptInImeMenu));
@@ -800,22 +788,19 @@ void BrowserOptionsHandler::RegisterMessages() {
base::Bind(&BrowserOptionsHandler::SetDefaultSearchEngine,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
- "deleteProfile",
- base::Bind(&BrowserOptionsHandler::DeleteProfile,
- base::Unretained(this)));
+ "deleteProfile", base::Bind(&BrowserOptionsHandler::DeleteProfile,
+ base::Unretained(this)));
web_ui()->RegisterMessageCallback(
"themesReset",
- base::Bind(&BrowserOptionsHandler::ThemesReset,
- base::Unretained(this)));
+ base::Bind(&BrowserOptionsHandler::ThemesReset, base::Unretained(this)));
web_ui()->RegisterMessageCallback(
"requestProfilesInfo",
base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
base::Unretained(this)));
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
web_ui()->RegisterMessageCallback(
- "themesSetNative",
- base::Bind(&BrowserOptionsHandler::ThemesSetNative,
- base::Unretained(this)));
+ "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative,
+ base::Unretained(this)));
#endif
web_ui()->RegisterMessageCallback(
"selectDownloadLocation",
@@ -849,9 +834,9 @@ void BrowserOptionsHandler::RegisterMessages() {
base::Bind(&BrowserOptionsHandler::VirtualKeyboardChangeCallback,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
- "onPowerwashDialogShow",
- base::Bind(&BrowserOptionsHandler::OnPowerwashDialogShow,
- base::Unretained(this)));
+ "onPowerwashDialogShow",
+ base::Bind(&BrowserOptionsHandler::OnPowerwashDialogShow,
+ base::Unretained(this)));
web_ui()->RegisterMessageCallback(
"performFactoryResetRestart",
base::Bind(&BrowserOptionsHandler::PerformFactoryResetRestart,
@@ -874,9 +859,8 @@ void BrowserOptionsHandler::RegisterMessages() {
base::Bind(&BrowserOptionsHandler::BecomeDefaultBrowser,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
- "restartBrowser",
- base::Bind(&BrowserOptionsHandler::HandleRestartBrowser,
- base::Unretained(this)));
+ "restartBrowser", base::Bind(&BrowserOptionsHandler::HandleRestartBrowser,
+ base::Unretained(this)));
web_ui()->RegisterMessageCallback(
"showNetworkProxySettings",
base::Bind(&BrowserOptionsHandler::ShowNetworkProxySettings,
@@ -910,7 +894,7 @@ void BrowserOptionsHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(
"launchEasyUnlockSetup",
base::Bind(&BrowserOptionsHandler::HandleLaunchEasyUnlockSetup,
- base::Unretained(this)));
+ base::Unretained(this)));
#if defined(OS_WIN)
web_ui()->RegisterMessageCallback(
"refreshExtensionControlIndicators",
@@ -918,7 +902,8 @@ void BrowserOptionsHandler::RegisterMessages() {
&BrowserOptionsHandler::HandleRefreshExtensionControlIndicators,
base::Unretained(this)));
#endif // defined(OS_WIN)
- web_ui()->RegisterMessageCallback("metricsReportingCheckboxChanged",
+ web_ui()->RegisterMessageCallback(
+ "metricsReportingCheckboxChanged",
base::Bind(&BrowserOptionsHandler::HandleMetricsReportingChange,
base::Unretained(this)));
@@ -930,14 +915,15 @@ void BrowserOptionsHandler::RegisterMessages() {
void BrowserOptionsHandler::Uninitialize() {
registrar_.RemoveAll();
- g_browser_process->profile_manager()->
- GetProfileAttributesStorage().RemoveObserver(this);
+ g_browser_process->profile_manager()
+ ->GetProfileAttributesStorage()
+ .RemoveObserver(this);
#if defined(OS_WIN)
ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->RemoveObserver(this);
#endif
#if defined(OS_CHROMEOS)
- ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(
- Profile::FromWebUI(web_ui()));
+ ArcAppListPrefs* arc_prefs =
+ ArcAppListPrefs::Get(Profile::FromWebUI(web_ui()));
if (arc_prefs)
arc_prefs->RemoveObserver(this);
#endif
@@ -978,11 +964,12 @@ void BrowserOptionsHandler::InitializeHandler() {
base::Unretained(this)));
}
- g_browser_process->policy_service()->AddObserver(
- policy::POLICY_DOMAIN_CHROME, this);
+ g_browser_process->policy_service()->AddObserver(policy::POLICY_DOMAIN_CHROME,
+ this);
- g_browser_process->profile_manager()->
- GetProfileAttributesStorage().AddObserver(this);
+ g_browser_process->profile_manager()
+ ->GetProfileAttributesStorage()
+ .AddObserver(this);
browser_sync::ProfileSyncService* sync_service(
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));
@@ -1002,8 +989,7 @@ void BrowserOptionsHandler::InitializeHandler() {
#if !defined(OS_CHROMEOS)
default_browser_policy_.Init(
- prefs::kDefaultBrowserSettingEnabled,
- g_browser_process->local_state(),
+ prefs::kDefaultBrowserSettingEnabled, g_browser_process->local_state(),
base::Bind(&BrowserOptionsHandler::UpdateDefaultBrowserState,
base::Unretained(this)));
#endif
@@ -1096,7 +1082,7 @@ void BrowserOptionsHandler::InitializeHandler() {
ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile);
if (arc_prefs)
arc_prefs->AddObserver(this);
-#else // !defined(OS_CHROMEOS)
+#else // !defined(OS_CHROMEOS)
profile_pref_registrar_.Add(
proxy_config::prefs::kProxy,
base::Bind(&BrowserOptionsHandler::SetupProxySettingsSection,
@@ -1140,7 +1126,8 @@ void BrowserOptionsHandler::InitializePage() {
SetupAccessibilityFeatures();
policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
- enable_factory_reset_ = !connector->IsEnterpriseManaged() &&
+ enable_factory_reset_ =
+ !connector->IsEnterpriseManaged() &&
!user_manager::UserManager::Get()->IsLoggedInAsGuest() &&
!user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser();
if (enable_factory_reset_) {
@@ -1168,8 +1155,7 @@ void BrowserOptionsHandler::InitializePage() {
base::FundamentalValue is_arc_enabled(
arc::ArcSessionManager::Get()->IsArcEnabled());
web_ui()->CallJavascriptFunctionUnsafe(
- "BrowserOptions.showAndroidAppsSection",
- is_arc_enabled);
+ "BrowserOptions.showAndroidAppsSection", is_arc_enabled);
// Get the initial state of Android Settings app readiness.
std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
ArcAppListPrefs::Get(profile)->GetApp(arc::kSettingsAppId);
@@ -1259,12 +1245,11 @@ void BrowserOptionsHandler::OnDefaultBrowserWorkerFinished(
}
void BrowserOptionsHandler::SetDefaultBrowserUIString(int status_string_id) {
- base::StringValue status_string(
- l10n_util::GetStringFUTF16(status_string_id,
- l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+ base::StringValue status_string(l10n_util::GetStringFUTF16(
+ status_string_id, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
- base::FundamentalValue is_default(
- status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT);
+ base::FundamentalValue is_default(status_string_id ==
+ IDS_OPTIONS_DEFAULTBROWSER_DEFAULT);
base::FundamentalValue can_be_default(
!IsDisabledByPolicy(default_browser_policy_) &&
@@ -1406,8 +1391,9 @@ void BrowserOptionsHandler::OnProfileAvatarChanged(
std::unique_ptr<base::ListValue> BrowserOptionsHandler::GetProfilesInfoList() {
std::vector<ProfileAttributesEntry*> entries =
- g_browser_process->profile_manager()->
- GetProfileAttributesStorage().GetAllProfilesAttributesSortedByName();
+ g_browser_process->profile_manager()
+ ->GetProfileAttributesStorage()
+ .GetAllProfilesAttributesSortedByName();
std::unique_ptr<base::ListValue> profile_info_list(new base::ListValue);
base::FilePath current_profile_path =
web_ui()->GetWebContents()->GetBrowserContext()->GetPath();
@@ -1427,8 +1413,8 @@ std::unique_ptr<base::ListValue> BrowserOptionsHandler::GetProfilesInfoList() {
profile_value->SetBoolean("isChild", entry->IsChild());
if (entry->IsUsingGAIAPicture() && entry->GetGAIAPicture()) {
- gfx::Image icon = profiles::GetAvatarIconForWebUI(entry->GetAvatarIcon(),
- true);
+ gfx::Image icon =
+ profiles::GetAvatarIconForWebUI(entry->GetAvatarIcon(), true);
profile_value->SetString("iconURL",
webui::GetBitmapDataUrl(icon.AsBitmap()));
} else {
@@ -1464,8 +1450,7 @@ void BrowserOptionsHandler::DeleteProfile(const base::ListValue* args) {
return;
}
- webui::DeleteProfileAtPath(file_path,
- web_ui(),
+ webui::DeleteProfileAtPath(file_path, web_ui(),
ProfileMetrics::DELETE_PROFILE_SETTINGS);
}
@@ -1483,8 +1468,8 @@ void BrowserOptionsHandler::ObserveThemeChanged() {
"BrowserOptions.setNativeThemeButtonEnabled", native_theme_enabled);
#endif
- bool is_classic_theme = !is_system_theme &&
- theme_service->UsingDefaultTheme();
+ bool is_classic_theme =
+ !is_system_theme && theme_service->UsingDefaultTheme();
base::FundamentalValue enabled(!is_classic_theme);
web_ui()->CallJavascriptFunctionUnsafe(
"BrowserOptions.setThemesResetButtonEnabled", enabled);
@@ -1588,17 +1573,17 @@ BrowserOptionsHandler::GetSyncStateDictionary() {
sync_status->SetBoolean("syncSystemEnabled", (service != NULL));
sync_status->SetBoolean("setupCompleted",
service && service->IsFirstSetupComplete());
- sync_status->SetBoolean("setupInProgress",
+ sync_status->SetBoolean(
+ "setupInProgress",
service && !service->IsManaged() && service->IsFirstSetupInProgress());
base::string16 status_label;
base::string16 link_label;
sync_ui_util::ActionType action_type = sync_ui_util::NO_ACTION;
bool status_has_error =
- sync_ui_util::GetStatusLabels(profile, service, *signin,
- sync_ui_util::WITH_HTML, &status_label,
- &link_label, &action_type) ==
- sync_ui_util::SYNC_ERROR;
+ sync_ui_util::GetStatusLabels(
+ profile, service, *signin, sync_ui_util::WITH_HTML, &status_label,
+ &link_label, &action_type) == sync_ui_util::SYNC_ERROR;
sync_status->SetString("statusText", status_label);
sync_status->SetString("actionLinkText", link_label);
sync_status->SetBoolean("hasError", status_has_error);
@@ -1625,15 +1610,13 @@ void BrowserOptionsHandler::HandleSelectDownloadLocation(
select_folder_dialog_->SelectFile(
ui::SelectFileDialog::SELECT_FOLDER,
l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE),
- pref_service->GetFilePath(prefs::kDownloadDefaultDirectory),
- &info,
- 0,
+ pref_service->GetFilePath(prefs::kDownloadDefaultDirectory), &info, 0,
base::FilePath::StringType(),
- web_ui()->GetWebContents()->GetTopLevelNativeWindow(),
- NULL);
+ web_ui()->GetWebContents()->GetTopLevelNativeWindow(), NULL);
}
-void BrowserOptionsHandler::FileSelected(const base::FilePath& path, int index,
+void BrowserOptionsHandler::FileSelected(const base::FilePath& path,
+ int index,
void* params) {
content::RecordAction(UserMetricsAction("Options_SetDownloadDirectory"));
PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
@@ -1672,12 +1655,10 @@ void BrowserOptionsHandler::OnWallpaperPolicyChanged(
OnWallpaperManagedChanged(has_policy);
}
-void BrowserOptionsHandler::OnPowerwashDialogShow(
- const base::ListValue* args) {
- UMA_HISTOGRAM_ENUMERATION(
- "Reset.ChromeOS.PowerwashDialogShown",
- chromeos::reset::DIALOG_FROM_OPTIONS,
- chromeos::reset::DIALOG_VIEW_TYPE_SIZE);
+void BrowserOptionsHandler::OnPowerwashDialogShow(const base::ListValue* args) {
+ UMA_HISTOGRAM_ENUMERATION("Reset.ChromeOS.PowerwashDialogShown",
+ chromeos::reset::DIALOG_FROM_OPTIONS,
+ chromeos::reset::DIALOG_VIEW_TYPE_SIZE);
}
#endif // defined(OS_CHROMEOS)
@@ -1779,7 +1760,8 @@ void BrowserOptionsHandler::ShowCloudPrintDevicesPage(
void BrowserOptionsHandler::SetHotwordAudioHistorySectionVisible(
const base::string16& audio_history_state,
- bool success, bool logging_enabled) {
+ bool success,
+ bool logging_enabled) {
bool visible = logging_enabled && success;
web_ui()->CallJavascriptFunctionUnsafe(
"BrowserOptions.setAudioHistorySectionVisible",
@@ -1792,7 +1774,8 @@ void BrowserOptionsHandler::HandleRequestGoogleNowAvailable(
if (template_url_service_ && template_url_service_->loaded()) {
const TemplateURL* default_url =
template_url_service_->GetDefaultSearchProvider();
- if (default_url && default_url->HasGoogleBaseURLs(
+ if (default_url &&
+ default_url->HasGoogleBaseURLs(
template_url_service_->search_terms_data())) {
is_search_provider_google = true;
}
@@ -1816,14 +1799,15 @@ void BrowserOptionsHandler::HandleRequestHotwordAvailable(
if (template_url_service_ && template_url_service_->loaded()) {
const TemplateURL* default_url =
template_url_service_->GetDefaultSearchProvider();
- if (default_url && default_url->HasGoogleBaseURLs(
+ if (default_url &&
+ default_url->HasGoogleBaseURLs(
template_url_service_->search_terms_data())) {
is_search_provider_google = true;
} else {
// If the user has chosen a default search provide other than Google, turn
// off hotwording since other providers don't provide that functionality.
HotwordService* hotword_service =
- HotwordServiceFactory::GetForProfile(profile);
+ HotwordServiceFactory::GetForProfile(profile);
if (hotword_service)
hotword_service->DisableHotwordPreferences();
}
@@ -1875,15 +1859,14 @@ void BrowserOptionsHandler::HandleRequestHotwordAvailable(
DCHECK(!user_display_name.empty());
base::string16 audio_history_state =
l10n_util::GetStringFUTF16(IDS_HOTWORD_AUDIO_HISTORY_ENABLED,
- base::ASCIIToUTF16(user_display_name));
+ base::ASCIIToUTF16(user_display_name));
HotwordService* hotword_service =
HotwordServiceFactory::GetForProfile(profile);
if (hotword_service) {
hotword_service->GetAudioHistoryHandler()->GetAudioHistoryEnabled(
base::Bind(
&BrowserOptionsHandler::SetHotwordAudioHistorySectionVisible,
- weak_ptr_factory_.GetWeakPtr(),
- audio_history_state));
+ weak_ptr_factory_.GetWeakPtr(), audio_history_state));
}
}
@@ -1913,20 +1896,19 @@ void BrowserOptionsHandler::HandleLaunchHotwordAudioVerificationApp(
HotwordService::HOTWORD_AND_AUDIO_HISTORY;
if (retrain) {
- DCHECK(profile->GetPrefs()->GetBoolean(
- prefs::kHotwordAlwaysOnSearchEnabled));
- DCHECK(profile->GetPrefs()->GetBoolean(
- prefs::kHotwordAudioLoggingEnabled));
+ DCHECK(
+ profile->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));
+ DCHECK(profile->GetPrefs()->GetBoolean(prefs::kHotwordAudioLoggingEnabled));
launch_mode = HotwordService::RETRAIN;
} else if (profile->GetPrefs()->GetBoolean(
- prefs::kHotwordAudioLoggingEnabled)) {
- DCHECK(!profile->GetPrefs()->GetBoolean(
- prefs::kHotwordAlwaysOnSearchEnabled));
+ prefs::kHotwordAudioLoggingEnabled)) {
+ DCHECK(
+ !profile->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));
launch_mode = HotwordService::HOTWORD_ONLY;
} else {
- DCHECK(!profile->GetPrefs()->GetBoolean(
- prefs::kHotwordAlwaysOnSearchEnabled));
+ DCHECK(
+ !profile->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));
}
HotwordService* hotword_service =
@@ -1985,9 +1967,8 @@ void BrowserOptionsHandler::OnAppRemoved(const std::string& app_id) {
OnAppReadyChanged(app_id, false);
}
-void BrowserOptionsHandler::OnAppReadyChanged(
- const std::string& app_id,
- bool ready) {
+void BrowserOptionsHandler::OnAppReadyChanged(const std::string& app_id,
+ bool ready) {
if (app_id == arc::kSettingsAppId) {
UpdateAndroidSettingsAppState(ready);
}
@@ -2008,11 +1989,19 @@ void BrowserOptionsHandler::ShowAndroidAppsSettings(
return;
}
- arc::LaunchAndroidSettingsApp(profile);
+ // We only care whether the event came from a keyboard or non-keyboard
+ // (mouse/touch). Set the default flags in such a way that it would appear
+ // that it came from a mouse by default.
+ int flags = ui::EF_LEFT_MOUSE_BUTTON;
+ bool is_mouse_or_touch = true;
+ if (args->GetBoolean(0, &is_mouse_or_touch) && !is_mouse_or_touch)
+ flags = ui::EF_NONE;
+
+ arc::LaunchAndroidSettingsApp(profile, flags);
}
void BrowserOptionsHandler::ShowAccessibilityTalkBackSettings(
- const base::ListValue *args) {
+ const base::ListValue* args) {
Profile* profile = Profile::FromWebUI(web_ui());
// Settings in secondary profile cannot access ARC.
if (!arc::ArcSessionManager::IsAllowedForProfile(profile)) {
@@ -2050,9 +2039,8 @@ void BrowserOptionsHandler::SetupNetworkPredictionControl() {
base::DictionaryValue dict;
dict.SetInteger("value",
pref_service->GetInteger(prefs::kNetworkPredictionOptions));
- dict.SetBoolean("disabled",
- !pref_service->IsUserModifiablePreference(
- prefs::kNetworkPredictionOptions));
+ dict.SetBoolean("disabled", !pref_service->IsUserModifiablePreference(
+ prefs::kNetworkPredictionOptions));
web_ui()->CallJavascriptFunctionUnsafe(
"BrowserOptions.setNetworkPredictionValue", dict);
@@ -2073,27 +2061,26 @@ void BrowserOptionsHandler::SetupFontSizeSelector() {
// setting it alters both the default font size and the default fixed font
// size. So it must be disabled when either of those prefs is not user
// modifiable.
- dict.SetBoolean("disabled",
- !default_font_size->IsUserModifiable() ||
- !default_fixed_font_size->IsUserModifiable());
+ dict.SetBoolean("disabled", !default_font_size->IsUserModifiable() ||
+ !default_fixed_font_size->IsUserModifiable());
// This is a simplified version of CoreOptionsHandler::CreateValueForPref,
// adapted to consider two prefs. It may be better to refactor
// CreateValueForPref so it can be called from here.
if (default_font_size->IsManaged() || default_fixed_font_size->IsManaged()) {
- dict.SetString("controlledBy", "policy");
+ dict.SetString("controlledBy", "policy");
} else if (default_font_size->IsExtensionControlled() ||
default_fixed_font_size->IsExtensionControlled()) {
- dict.SetString("controlledBy", "extension");
+ dict.SetString("controlledBy", "extension");
}
web_ui()->CallJavascriptFunctionUnsafe("BrowserOptions.setFontSize", dict);
}
void BrowserOptionsHandler::SetupPageZoomSelector() {
- double default_zoom_level =
- content::HostZoomMap::GetDefaultForBrowserContext(
- Profile::FromWebUI(web_ui()))->GetDefaultZoomLevel();
+ double default_zoom_level = content::HostZoomMap::GetDefaultForBrowserContext(
+ Profile::FromWebUI(web_ui()))
+ ->GetDefaultZoomLevel();
double default_zoom_factor =
content::ZoomLevelToZoomFactor(default_zoom_level);
@@ -2130,8 +2117,8 @@ void BrowserOptionsHandler::SetupAutoOpenFileTypes() {
// We show the button if the user has any auto-open file types registered.
DownloadManager* manager = BrowserContext::GetDownloadManager(
web_ui()->GetWebContents()->GetBrowserContext());
- bool display = manager &&
- DownloadPrefs::FromDownloadManager(manager)->IsAutoOpenUsed();
+ bool display =
+ manager && DownloadPrefs::FromDownloadManager(manager)->IsAutoOpenUsed();
base::FundamentalValue value(display);
web_ui()->CallJavascriptFunctionUnsafe(
"BrowserOptions.setAutoOpenFileTypesDisplayed", value);
@@ -2142,8 +2129,8 @@ void BrowserOptionsHandler::SetupProxySettingsSection() {
PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
const PrefService::Preference* proxy_config =
pref_service->FindPreference(proxy_config::prefs::kProxy);
- bool is_extension_controlled = (proxy_config &&
- proxy_config->IsExtensionControlled());
+ bool is_extension_controlled =
+ (proxy_config && proxy_config->IsExtensionControlled());
base::FundamentalValue disabled(proxy_config &&
!proxy_config->IsUserModifiable());
@@ -2160,8 +2147,10 @@ void BrowserOptionsHandler::SetupProxySettingsSection() {
}
void BrowserOptionsHandler::SetupManagingSupervisedUsers() {
- bool has_users = !Profile::FromWebUI(web_ui())->
- GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
+ bool has_users = !Profile::FromWebUI(web_ui())
+ ->GetPrefs()
+ ->GetDictionary(prefs::kSupervisedUsers)
+ ->empty();
base::FundamentalValue has_users_value(has_users);
web_ui()->CallJavascriptFunctionUnsafe(
"BrowserOptions.updateManagesSupervisedUsers", has_users_value);
« chrome/browser/ui/app_list/arc/arc_app_utils.cc ('K') | « chrome/browser/ui/ash/launcher/launcher_controller_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698