<header>
<h1 i18n-content="settingsTitle"></h1>
</header>
- <include src="reset_profile_settings_banner.html">
-<if expr="not pp_ifdef('chromeos')">
- <include src="sync_section.html">
-</if>
-<if expr="pp_ifdef('chromeos')">
+ <include src="automatic_settings_reset_banner.html">
+<if expr="chromeos">
+ <include src="secondary_user_banner.html">
<section>
- <h3 i18n-content="sectionTitleInternet"></h3>
+ <div id="network-section-header" class="section-header">
+ <h3 i18n-content="sectionTitleInternet"></h3>
+ <span class="controlled-setting-indicator" plural></span>
+ </div>
<div id="network-settings">
<list id="network-list"></list>
<div id="shared-proxies" class="checkbox">
<label>
<input id="use-shared-proxies" type="checkbox"
+ metric="Options_NetworkUseSharedProxies"
pref="settings.use_shared_proxies">
<span i18n-content="useSharedProxies"></span>
</label>
</div>
</section>
</if>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
+ <include src="sync_section.html">
<include src="startup_section.html">
</if>
- <section>
+ <section id="proxy-section" hidden>
+ <h3 i18n-content="sectionTitleProxy"></h3>
+ <div id="proxy-section-content"></div>
+ </section>
+
+ <section id="appearance-section">
<h3 i18n-content="sectionTitleAppearance"></h3>
<div class="settings-row">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<button id="set-wallpaper" i18n-content="setWallpaper"
guest-visibility="disabled"></button>
+ <span id="wallpaper-indicator" class="controlled-setting-indicator">
+ </span>
</if>
-<if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx">
+<if expr="not chromeos and is_posix and not is_macosx">
<button id="themes-gallery" i18n-content="themesGallery"></button>
<button id="themes-native-button"
i18n-content="themesNativeButton"></button>
<button id="themes-reset"
i18n-content="themesSetClassic"></button>
</if>
-<if expr="pp_ifdef('chromeos') or is_win or is_macosx">
+<if expr="chromeos or is_win or is_macosx">
<button id="themes-gallery" i18n-content="themesGallery"></button>
<button id="themes-reset" i18n-content="themesReset"></button>
</if>
<span id="home-page-url" class="home-page-label"></span>
<button id="change-home-page" class="link-button"
i18n-content="changeHomePage"></button>
+ <div id="extension-controlled-container"></div>
</div>
</div>
<div class="checkbox" guest-visibility="disabled">
</span>
</span>
</div>
-<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+<if expr="is_posix and not chromeos and not is_macosx">
<div class="checkbox"><label>
<input id="show-window-decorations" type="checkbox"
pref="browser.custom_chrome_frame" metric="Options_CustomFrame"
</label></div>
</if>
</section>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<section>
<h3 i18n-content="sectionTitleDevice"></h3>
<div>
<span i18n-content="deviceGroupDescription"></span>
<div id="touchpad-settings" class="settings-row" hidden>
<span class="option-name" i18n-content="touchpadSpeed"></span>
- <input id="sensitivity-range" type="range" min="1" max="5"
+ <input id="touchpad-sensitivity-range" type="range" min="1" max="5"
pref="settings.touchpad.sensitivity2" class="touch-slider">
</div>
<div id="mouse-settings" class="settings-row" hidden>
<span class="option-name" i18n-content="mouseSpeed"></span>
- <input id="sensitivity-range" type="range" min="1" max="5"
+ <input id="mouse-sensitivity-range" type="range" min="1" max="5"
pref="settings.mouse.sensitivity2" class="touch-slider">
</div>
<div id="no-pointing-devices" i18n-content="noPointingDevices"
</if>
<section>
<h3 i18n-content="sectionTitleSearch"></h3>
- <div>
+ <div id="search-section-content">
<label for="default-search-engine" class="settings-row"
i18n-values=".innerHTML:defaultSearchGroupLabel">
</label>
<div class="settings-row">
<select id="default-search-engine" class="weakrtl"></select>
<span class="controlled-setting-indicator"
- pref="default_search_provider.enabled">
+ pref="default_search_provider_data.template_url_data">
</span>
<button id="manage-default-search-engines"
i18n-content="defaultSearchManageEngines">
</button>
</div>
</div>
- <div id ="hotword-search" hidden>
+ </section>
+ <section>
+ <h3 id="voice-section-title" i18n-content="sectionTitleVoice" hidden></h3>
+ <div id="voice-section-content">
+ <div id="hotword-always-on-search" hidden>
<div class="checkbox">
<span class="controlled-setting-with-label">
- <input id="hotword-search-enable" pref="hotword.search_enabled"
- type="checkbox">
+ <input id="hotword-always-on-search-enable"
+ pref="hotword.always_on_search_enabled" type="checkbox">
<span>
- <label for="hotword-search-enable"
- i18n-values=".innerHTML:hotwordSearchEnable">
+ <label for="hotword-always-on-search-enable"
+ i18n-content="hotwordAlwaysOnSearchEnable">
</label>
- <span class="controlled-setting-indicator"
- pref="hotword.search_enabled">
- </span>
</span>
</span>
- <div id="hotword-search-description" class="hotword-settings">
- <span i18n-content="hotwordSearchDescription"></span>
- </div>
</div>
- <div id="hotword-settings-section" class="hotword-settings" hidden>
- <div id="hotword-settings-section-container">
- <div class="checkbox">
- <span class="controlled-setting-with-label">
- <input id="hotword-search-timeout"
- pref="hotword.search_timeout_enabled" type="checkbox">
- <span>
- <label for="hotword-search-timeout"
- i18n-content="hotwordSearchTimeout">
- </label>
- <span class="controlled-setting-indicator"
- pref="hotword.search_timeout_enabled">
- </span>
- </span>
- </span>
- <div id="hotword-search-timeout-description"
- class="hotword-settings">
- <span i18n-content="hotwordSearchTimeoutDescription"></span>
- </div>
- </div>
- <div class="checkbox">
- <span class="controlled-setting-with-label">
- <input id="hotword-search-incognito-enable"
- pref="hotword.incognito_search_enabled" type="checkbox">
- <span>
- <label for="hotword-search-incognito-enable"
- i18n-content="hotwordSearchIncognito">
- </label>
- <span class="controlled-setting-indicator"
- pref="hotword.incognito_search_enabled">
- </span>
- </span>
- </span>
- </div>
- </div>
+ </div>
+ <div id="audio-logging" hidden>
+ <div class="checkbox">
+ <span class="controlled-setting-with-label">
+ <input id="audio-logging-enable"
+ pref="hotword.audio_logging_enabled" type="checkbox">
+ <span>
+ <label for="audio-logging-enable"
+ i18n-content="hotwordAudioHistoryEnable">
+ </label>
+ </span>
+ </span>
</div>
</div>
+ </div>
</section>
<section id="sync-users-section" guest-visibility="hidden">
<h3 i18n-content="sectionTitleUsers"></h3>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<include src="sync_section.html">
</if>
<div id="profiles-section" hidden>
</div>
<div id="profiles-buttons">
<button id="profiles-create" i18n-content="profilesCreate"></button>
-<if expr="pp_ifdef('enable_settings_app')">
+<if expr="enable_settings_app">
<button id="profiles-app-list-switch"
i18n-content="profilesAppListSwitch" hidden>
</button>
<button id="profiles-manage" i18n-content="profilesManage" disabled>
</button>
<button id="profiles-delete" i18n-content="profilesDelete"></button>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
<button id="import-data" i18n-content="importData"></button>
</if>
</div>
i18n-values=".innerHTML:profilesSupervisedDashboardTip" hidden>
</div>
</section>
-<if expr="not pp_ifdef('chromeos')">
- <section>
+ <section id="set-default-browser-section">
+<if expr="not chromeos">
<h3 i18n-content="sectionTitleDefaultBrowser"></h3>
<div>
<button id="set-as-default-browser"
</label>
</div>
</div>
+</if> <!-- not chromeos -->
</section>
-</if> <!-- not pp_ifdef('chromeos') -->
<div id="advanced-settings" hidden>
<div id="advanced-settings-container">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<section>
<h3 i18n-content="datetimeTitle"></h3>
<div class="option-control-table">
</select>
</div>
</div>
- <div class="checkbox">
+ <div class="checkbox settings-row">
<label>
<input id="use-24hour-clock" pref="settings.clock.use_24hour_clock"
type="checkbox">
<span i18n-content="use24HourClock"></span>
</label>
</div>
+ <div id="time-synced-explanation" class="settings-row"
+ i18n-content="timeSyncedExplanation"></div>
+ <div id="set-time" class="settings-row" hidden>
+ <button id="set-time-button"
+ i18n-content="setTimeButton"></button>
+ </div>
+ </div>
+ </section>
+
+ <section id="device-control-section" hidden>
+ <h3 i18n-content="deviceControlTitle"></h3>
+ <div id="consumer-management-section">
+ <div class="settings-row">
+ <span i18n-content="consumerManagementDescription"></span>
+ </div>
+ <div id="consumer-management-enroll" class="settings-row">
+ <button i18n-content="consumerManagementEnrollButton"></button>
+ </div>
+ <div id="consumer-management-unenroll" class="settings-row" hidden>
+ <button i18n-content="consumerManagementUnenrollButton"></button>
+ </div>
</div>
</section>
</if>
</div>
<div class="checkbox" guest-visibility="disabled">
<span class="controlled-setting-with-label">
- <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled"
+ <input id="networkPredictionOptions"
metric="Options_DnsPrefetchCheckbox" type="checkbox">
<span>
- <label for="dnsPrefetchingEnabled"
+ <label for="networkPredictionOptions"
i18n-content="networkPredictionEnabledDescription">
</label>
<span class="controlled-setting-indicator"
- pref="dns_prefetching.enabled">
+ pref="net.network_prediction_options">
+ </span>
+ </span>
+ </span>
+ </div>
+ <div class="checkbox">
+ <span class="controlled-setting-with-label">
+ <input id="safe-browsing-extended-reporting-enabled"
+ metric="Options_SafeBrowsingExtendedReportingCheckbox"
+ pref="safebrowsing.extended_reporting_enabled"
+ type="checkbox">
+ <span>
+ <label for="safe-browsing-extended-reporting-enabled"
+ i18n-content="safeBrowsingEnableExtendedReporting">
+ </label>
+ <span class="controlled-setting-indicator"
+ pref="safebrowsing.extended_reporting_enabled">
</span>
</span>
</span>
</span>
</span>
</div>
-<if expr="pp_ifdef('_google_chrome')">
+<if expr="_google_chrome">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="spelling-enabled-control" type="checkbox"
+ metric="Options_SpellingServiceCheckbox"
pref="spellcheck.use_spelling_service" dialog-pref>
<span>
<label for="spelling-enabled-control" i18n-content="spellingPref">
</div>
<div id="metricsReportingSetting" class="checkbox">
<span class="controlled-setting-with-label">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<input id="metricsReportingEnabled"
pref="cros.metrics.reportingEnabled" type="checkbox">
<span>
</span>
</span>
</if>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
<input id="metricsReportingEnabled"
pref="user_experience_metrics.reporting_enabled" type="checkbox">
<span>
<span class="controlled-setting-indicator"
pref="user_experience_metrics.reporting_enabled">
</span>
+ <span id="metrics-reporting-reset-restart">
+ <!-- Text filled by JavaScript -->
+ <span></span><button class=
+ "link-button standalone-link-button"></button><span></span>
+ </span>
</span>
</if>
</span>
</div>
-</if> <!-- pp_ifdef('_google_chrome') -->
+</if> <!-- _google_chrome -->
<div class="checkbox">
<label>
<input id="do-not-track-enabled" pref="enable_do_not_track"
<span i18n-content="doNotTrack"></span>
</label>
</div>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="content-protection-attestation-enabled" type="checkbox"
</span>
</div>
</if>
+ <div id="hotword-search" hidden>
+ <div class="checkbox">
+ <span class="controlled-setting-with-label">
+ <input id="hotword-search-enable" pref="hotword.search_enabled_2"
+ metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
+ <span>
+ <label for="hotword-search-enable"
+ i18n-values=".innerHTML:hotwordSearchEnable">
+ </label>
+ <span id="hotword-search-setting-indicator"
+ pref="hotword.search_enabled_2" dialog-pref>
+ </span>
+ </span>
+ </span>
+ </div>
+ </div>
</div>
</section>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<!-- By default, the bluetooth section is hidden. It is only visible if a
bluetooth adapter is discovered -->
<section id="bluetooth-devices" hidden>
</div>
</div>
</section>
-</if> <!-- pp_ifdef('chromeos') -->
+</if> <!-- chromeos -->
<section id="passwords-and-autofill-section">
<h3 i18n-content="passwordsAndAutofillGroupName"></h3>
<div class="checkbox">
</div>
</if>
</section>
+ <section id="easy-unlock-section" guest-visibility="hidden" hidden>
+ <h3 i18n-content="easyUnlockSectionTitle"></h3>
+ <!-- Options shown when the user has not set up Easy Unlock -->
+ <div id='easy-unlock-setup' hidden>
+ <div class="controlled-setting-with-label">
+ <span i18n-content="easyUnlockSetupIntro"></span>
+ <a target="_blank" i18n-content="learnMore"
+ i18n-values="href:easyUnlockLearnMoreURL"></a>
+ </div>
+ <button id="easy-unlock-setup-button"
+ i18n-content="easyUnlockSetupButton"></button>
+ </div>
+ <!-- Options shown when the user has set up Easy Unlock -->
+ <div id='easy-unlock-enable' hidden>
+ <div class="controlled-setting-with-label">
+ <span i18n-content="easyUnlockDescription"></span>
+ <a target="_blank" i18n-content="learnMore"
+ i18n-values="href:easyUnlockLearnMoreURL"></a>
+ </div>
+ <button id="easy-unlock-turn-off-button"
+ i18n-content="easyUnlockTurnOffButton"></button>
+ </div>
+ </section>
<section id="web-content-section">
<h3 i18n-content="advancedSectionTitleContent"></h3>
<div>
+ <div id="website-settings-section" class="settings-row" hidden>
+ <button id="website-management-button"
+ i18n-content="websitesManage"></button>
+ </div>
<div class="settings-row">
<label class="web-content-select-label">
<span i18n-content="defaultFontSizeLabel"></span>
</if>
</div>
</section>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
<section id="network-section">
<h3 i18n-content="advancedSectionTitleNetwork"></h3>
<div>
- <span id="proxiesLabel" class="settings-row"></span>
+ <span id="proxiesLabel"
+ class="settings-row"
+ i18n-content="proxiesLabelSystem"></span>
<div class="settings-row">
<button id="proxiesConfigureButton"
i18n-content="proxiesConfigureButton"></button>
</span>
</span>
</div>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<div class="checkbox" id="disable-drive-row" guest-visibility="disabled">
<span class="controlled-setting-with-label">
<input id="drive-disabled" type="checkbox"
</span>
</div>
</if>
-<if expr="not pp_ifdef('chromeos')">
<div id="auto-open-file-types-section" hidden>
<div id="auto-open-file-types-container">
- <div id="auto-open-file-types-label"
+ <div id="auto-open-file-types-label" class="settings-row"
i18n-content="autoOpenFileTypesInfo"></div>
- <button id="autoOpenFileTypesResetToDefault"
- i18n-content="autoOpenFileTypesResetToDefault"></button>
+ <div class="settings-row">
+ <button id="autoOpenFileTypesResetToDefault"
+ i18n-content="autoOpenFileTypesResetToDefault"></button>
+ </div>
</div>
</div>
-</if>
</div>
</section>
<section>
- <h3 i18n-content="advancedSectionTitleSecurity"></h3>
+ <h3 i18n-content="advancedSectionTitleCertificates"></h3>
<div>
-<if expr="pp_ifdef('use_nss') or is_win or is_macosx">
+<if expr="use_nss or is_win or is_macosx">
<div class="settings-row">
<button id="certificatesManageButton"
i18n-content="certificatesManageButton"></button>
</div>
</if>
- <div class="checkbox">
- <label>
- <input id="sslCheckRevocation" pref="ssl.rev_checking.enabled"
- type="checkbox">
- <span i18n-content="sslCheckRevocation"></span>
- </label>
- </div>
</div>
</section>
- <section id="cloud-print-connector-section">
- <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
-<if expr="pp_ifdef('enable_mdns')">
- <div id="cloudprint-options-mdns" hidden>
+<if expr="enable_service_discovery">
+ <section id="cloudprint-options-mdns">
+ <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
<div class="settings-row">
<span i18n-content="cloudPrintOptionLabel"></span>
<a target="_blank" i18n-content="learnMore"
<input id="local-discovery-notifications-enabled"
pref="local_discovery.notifications_enabled"
type="checkbox"
- metric="LocalDiscoveryNotificationsDisabled_Settings" />
+ metric="LocalDiscoveryNotificationsDisabled_Settings">
<span>
<label for="local-discovery-notifications-enabled"
i18n-content="cloudPrintEnableNotificationsLabel">
pref="local_discovery.notifications_enabled">
</span>
</span>
+ </span>
</div>
- </div>
-</if>
-
- <div id="cloudprint-options-nomdns">
-<if expr="pp_ifdef('chromeos')">
- <div>
- <span i18n-content="cloudPrintOptionLabel"></span>
- <a target="_blank" i18n-content="learnMore"
- i18n-values="href:cloudPrintLearnMoreURL"></a>
- </div>
-</if>
-
-<if expr="not pp_ifdef('chromeos')">
- <p id="cloudPrintConnectorLabel" class="settings-row"
- i18n-content="cloudPrintConnectorDisabledLabel"></p>
+ </section>
</if>
- <div class="settings-row">
-<if expr="not pp_ifdef('chromeos')">
- <button id="cloudPrintConnectorSetupButton"
- i18n-content="cloudPrintConnectorDisabledButton"></button>
-</if>
-
- <button id="cloudPrintManageButton"
- i18n-content="cloudPrintManageButton">
- </button>
- </div>
- </div>
- </section>
-
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<include src="startup_section.html">
<section>
<h3 i18n-content="accessibilityTitle"></h3>
<div class="option-control-table">
<p id="accessibility-explanation" class="settings-row">
<span i18n-content="accessibilityExplanation"></span>
- <a target="_blank" i18n-content="learnMore"
- i18n-values="href:accessibilityLearnMoreURL"></a>
+ <a id="accessibility-learn-more" target="_blank"
+ i18n-content="learnMore"></a>
</p>
<div class="option-name">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="accessibility-should-always-show-menu"
- pref="settings.a11y.enable_menu" type="checkbox">
+ pref="settings.a11y.enable_menu" type="checkbox"
+ metric="Options_AccessibilitySystemMenu">
<span>
<label for="accessibility-should-always-show-menu"
i18n-content="accessibilityAlwaysShowMenu">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="accessibility-large-cursor-check"
- pref="settings.a11y.large_cursor_enabled" type="checkbox">
+ pref="settings.a11y.large_cursor_enabled" type="checkbox"
+ metric="Options_AccessibilityLargeMouseCursor">
<span>
<label for="accessibility-large-cursor-check"
i18n-content="accessibilityLargeCursor">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="accessibility-high-contrast-check"
- pref="settings.a11y.high_contrast_enabled" type="checkbox">
+ pref="settings.a11y.high_contrast_enabled" type="checkbox"
+ metric="Options_AccessibilityHighContrastMode">
<span>
<label for="accessibility-high-contrast-check"
i18n-content="accessibilityHighContrast">
</span>
</div>
</div>
- <div id="accessibility-sticky-keys" class="option-name" hidden>
+ <div id="accessibility-sticky-keys" class="option-name">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="accessibility-sticky-keys-check"
- pref="settings.a11y.sticky_keys_enabled" type="checkbox">
+ pref="settings.a11y.sticky_keys_enabled" type="checkbox"
+ metric="Options_AccessibilityStickyKeys">
<span>
<label for="accessibility-sticky-keys-check"
i18n-content="accessibilityStickyKeys">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="accessibility-spoken-feedback-check"
- pref="settings.accessibility" type="checkbox">
+ pref="settings.accessibility" type="checkbox"
+ metric="Options_AccessibilitySpokenFeedback">
<span>
<label for="accessibility-spoken-feedback-check"
i18n-content="accessibilitySpokenFeedback">
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="accessibility-screen-magnifier-check"
- pref="settings.a11y.screen_magnifier" type="checkbox">
+ pref="settings.a11y.screen_magnifier" type="checkbox"
+ metric="Options_AccessibilityScreenMagnifier">
<span>
<label for="accessibility-screen-magnifier-check"
i18n-content="accessibilityScreenMagnifier">
<div class="checkbox">
<label>
<input id="accessibility-tap-dragging-check"
- pref="settings.touchpad.enable_tap_dragging" type="checkbox">
+ pref="settings.touchpad.enable_tap_dragging" type="checkbox"
+ metric="Options_AccessibilityTapDragging">
<span i18n-content="accessibilityTapDragging"></span>
</label>
</div>
</span>
</div>
</div>
+ <div class="option_name" id="accessibility_onscreen_keyboard">
+ <div class="checkbox">
+ <span class="controlled-setting-with-label">
+ <input id="accessibility-virtual-keyboard-check"
+ pref="settings.a11y.virtual_keyboard" type="checkbox"
+ metric="Options_AccessibilityOnScreenKeyboard">
+ <span>
+ <label for="accessibility-virtual-keyboard-check"
+ i18n-content="accessibilityVirtualKeyboard">
+ </label>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.virtual_keyboard">
+ </span>
+ </span>
+ </span>
+ </div>
+ </div>
</section>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<section id="factory-reset-section" hidden>
<h3 i18n-content="factoryResetTitle"></h3>
<div>
</section>
</if>
</if>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
<section id="system-section">
<h3 i18n-content="advancedSectionTitleSystem"></h3>
<if expr="not is_macosx">
</div>
</section>
</if>
- <section id="reset-profile-settings-section" hidden>
+ <section id="reset-profile-settings-section">
<h3 i18n-content="resetProfileSettingsSectionTitle"></h3>
<div>
<span class="settings-row" i18n-content="resetProfileSettingsDescription">
<button id="advanced-settings-expander" class="link-button"
i18n-content="showAdvancedSettings">
</button>
+<if expr="chromeos">
+ <button id="version-button" class="link-button" hidden
+ i18n-content="browserVersion">
+ </button>
+</if>
</footer>
- </div>
+</div>
projects / platform / framework / web / crosswalk.git / blobdiff