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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/browser_options.html

Issue 572853007: reland ce80b519af00bb6259e8c63f91fee5263d818124 with fix for failed test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge conflict again Created 6 years, 3 months 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
« no previous file with comments | « no previous file | chrome/browser/resources/options/content_settings.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/browser_options.html
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 4c11e5efec6ebfe6a75a60996bc5e947f121909e..cad55b3e9683bb61c7adb1441941fb441367cd4e 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -60,10 +60,12 @@
<input type="checkbox"
pref="browser.show_home_button"
metric="Options_Homepage_HomeButton">
- <span i18n-content="homePageShowHomeButton"></span>
+ <span>
+ <span i18n-content="homePageShowHomeButton"></span>
+ <span class="controlled-setting-indicator"
+ pref="browser.show_home_button"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="browser.show_home_button"></span>
</div>
<div id="change-home-page-section" hidden>
<div id="change-home-page-section-container" guest-visibility="disabled">
@@ -81,11 +83,12 @@
<input type="checkbox"
pref="bookmark_bar.show_on_all_tabs"
metric="Options_ShowBookmarksBar">
- <span i18n-content="toolbarShowBookmarksBar"></span>
+ <span>
+ <span i18n-content="toolbarShowBookmarksBar"></span>
+ <span class="controlled-setting-indicator"
+ pref="bookmark_bar.show_on_all_tabs"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="bookmark_bar.show_on_all_tabs">
- </span>
</div>
<if expr="is_posix and not chromeos and not is_macosx">
<div class="checkbox"><label>
@@ -291,32 +294,36 @@
<input id="alternateErrorPagesEnabled"
pref="alternate_error_pages.enabled"
metric="Options_LinkDoctorCheckbox" type="checkbox">
- <span i18n-content="linkDoctorPref"></span>
+ <span>
+ <span i18n-content="linkDoctorPref"></span>
+ <span class="controlled-setting-indicator"
+ pref="alternate_error_pages.enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="alternate_error_pages.enabled">
- </span>
</div>
<div class="checkbox controlled-setting-with-label"
guest-visibility="disabled">
<label>
<input pref="search.suggest_enabled"
metric="Options_UseSuggestCheckbox" type="checkbox">
- <span i18n-content="suggestPref"></span>
+ <span>
+ <span i18n-content="suggestPref"></span>
+ <span class="controlled-setting-indicator"
+ pref="search.suggest_enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="search.suggest_enabled">
- </span>
</div>
<div class="checkbox" guest-visibility="disabled">
<span class="controlled-setting-with-label">
<label>
<input id="networkPredictionOptions"
metric="Options_DnsPrefetchCheckbox" type="checkbox">
- <span i18n-content="networkPredictionEnabledDescription"></span>
+ <span>
+ <span i18n-content="networkPredictionEnabledDescription"></span>
+ <span class="controlled-setting-indicator"
+ pref="net.network_prediction_options"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="net.network_prediction_options"></span>
</span>
</div>
<div class="checkbox controlled-setting-with-label">
@@ -325,21 +332,23 @@
metric="Options_SafeBrowsingExtendedReportingCheckbox"
pref="safebrowsing.extended_reporting_enabled"
type="checkbox">
- <span i18n-content="safeBrowsingEnableExtendedReporting"></span>
+ <span>
+ <span i18n-content="safeBrowsingEnableExtendedReporting"></span>
+ <span class="controlled-setting-indicator"
+ pref="safebrowsing.extended_reporting_enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="safebrowsing.extended_reporting_enabled">
- </span>
</div>
<div class="checkbox controlled-setting-with-label">
<label>
<input pref="safebrowsing.enabled"
metric="Options_SafeBrowsingCheckbox" type="checkbox">
- <span i18n-content="safeBrowsingEnableProtection"></span>
+ <span>
+ <span i18n-content="safeBrowsingEnableProtection"></span>
+ <span class="controlled-setting-indicator"
+ pref="safebrowsing.enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="safebrowsing.enabled">
- </span>
</div>
<if expr="_google_chrome">
<div class="checkbox controlled-setting-with-label">
@@ -347,12 +356,13 @@
<input id="spelling-enabled-control" type="checkbox"
metric="Options_SpellingServiceCheckbox"
pref="spellcheck.use_spelling_service" dialog-pref>
- <span i18n-content="spellingPref"></span>
+ <span>
+ <span i18n-content="spellingPref"></span>
+ <span id="spelling-enabled-indicator"
+ class="controlled-setting-indicator"
+ pref="spellcheck.use_spelling_service" dialog-pref>
+ </span>
</label>
- <span id="spelling-enabled-indicator"
- class="controlled-setting-indicator"
- pref="spellcheck.use_spelling_service" dialog-pref>
- </span>
</div>
<div id="metricsReportingSetting"
class="checkbox controlled-setting-with-label">
@@ -360,19 +370,22 @@
<label>
<input id="metricsReportingEnabled"
pref="cros.metrics.reportingEnabled" type="checkbox">
- <span i18n-content="enableLogging"></span>
+ <span>
+ <span i18n-content="enableLogging"></span>
+ <span class="controlled-setting-indicator"
+ pref="cros.metrics.reportingEnabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="cros.metrics.reportingEnabled"></span>
</if>
<if expr="not chromeos">
<label>
<input id="metricsReportingEnabled" type="checkbox">
- <span i18n-content="enableLogging">
+ <span>
+ <span i18n-content="enableLogging"></span>
+ <span id="metrics-reporting-disabled-icon"
+ class="controlled-setting-indicator"></span>
+ </span>
</label>
- <span id="metrics-reporting-disabled-icon"
- class="controlled-setting-indicator">
- </span>
<span id="metrics-reporting-reset-restart">
<!-- Text filled by JavaScript -->
<span></span><button class=
@@ -393,14 +406,16 @@
<label>
<input id="content-protection-attestation-enabled" type="checkbox"
pref="cros.device.attestation_for_content_protection_enabled">
- <span i18n-content="enableContentProtectionAttestation"></span>
+ <span>
+ <span i18n-content="enableContentProtectionAttestation"></span>
+ <span class="controlled-setting-indicator"
+ pref="cros.device.attestation_for_content_protection_enabled">
+ </span>
+ </span>
</label>
<a target="_blank" i18n-content="learnMore"
i18n-values="href:contentProtectionAttestationLearnMoreURL">
</a>
- <span class="controlled-setting-indicator"
- pref="cros.device.attestation_for_content_protection_enabled">
- </span>
</div>
</if>
<div id="hotword-search" hidden>
@@ -408,11 +423,12 @@
<label>
<input id="hotword-search-enable" pref="hotword.search_enabled_2"
metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
- <span i18n-values=".innerHTML:hotwordSearchEnable"></span>
+ <span>
+ <span i18n-values=".innerHTML:hotwordSearchEnable"></span>
+ <span id="hotword-search-setting-indicator"
+ pref="hotword.search_enabled_2" dialog-pref></span>
+ </span>
</label>
- <span id="hotword-search-setting-indicator"
- pref="hotword.search_enabled_2" dialog-pref>
- </span>
</div>
</div>
</div>
@@ -451,8 +467,10 @@
<label>
<input id="autofill-enabled" pref="autofill.enabled"
metric="Options_FormAutofill" type="checkbox">
- <span i18n-content="autofillEnabled"></span>
- <span class="controlled-setting-indicator" pref="autofill.enabled">
+ <span>
+ <span i18n-content="autofillEnabled"></span>
+ <span class="controlled-setting-indicator" pref="autofill.enabled">
+ </span>
</span>
</label>
<button id="autofill-settings" class="link-button"
@@ -464,9 +482,10 @@
<input id="password-manager-enabled"
pref="profile.password_manager_enabled"
metric="Options_PasswordManager" type="checkbox">
- <span i18n-content="passwordManagerEnabled"></span>
- <span class="controlled-setting-indicator"
- pref="profile.password_manager_enabled"></span>
+ <span>
+ <span i18n-content="passwordManagerEnabled"></span>
+ <span class="controlled-setting-indicator"
+ pref="profile.password_manager_enabled"></span>
</span>
</label>
<button id="manage-passwords" class="link-button"
@@ -481,7 +500,7 @@
<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">
+ <div class="settings-row">
<span i18n-content="easyUnlockSetupIntro"></span>
<a target="_blank" i18n-content="learnMore"
i18n-values="href:easyUnlockLearnMoreURL"></a>
@@ -491,7 +510,7 @@
</div>
<!-- Options shown when the user has set up Easy Unlock -->
<div id='easy-unlock-enable' hidden>
- <div class="controlled-setting-with-label">
+ <div class="settings-row">
<span i18n-content="easyUnlockDescription"></span>
<a target="_blank" i18n-content="learnMore"
i18n-values="href:easyUnlockLearnMoreURL"></a>
@@ -572,10 +591,12 @@
<label>
<input pref="translate.enabled"
metric="Options_Translate" type="checkbox">
- <span i18n-content="translateEnableTranslate"></span>
+ <span>
+ <span i18n-content="translateEnableTranslate"></span>
+ <span class="controlled-setting-indicator" pref="translate.enabled">
+ </span>
+ </span>
</label>
- <span class="controlled-setting-indicator" pref="translate.enabled">
- </span>
<button id="manage-languages" class="link-button"
i18n-content="manageLanguages"></button>
</div>
@@ -603,10 +624,12 @@
<input type="checkbox"
pref="download.prompt_for_download"
metric="Options_AskForSaveLocation">
- <span i18n-content="downloadLocationAskForSaveLocation"></span>
+ <span>
+ <span i18n-content="downloadLocationAskForSaveLocation"></span>
+ <span class="controlled-setting-indicator"
+ pref="download.prompt_for_download"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="download.prompt_for_download"></span>
</div>
<if expr="chromeos">
<div class="checkbox controlled-setting-with-label"
@@ -615,10 +638,12 @@
<input type="checkbox"
pref="gdata.disabled"
metric="Options_DisableGData">
- <span i18n-content="disableGData"></span>
+ <span>
+ <span i18n-content="disableGData"></span>
+ <span class="controlled-setting-indicator" pref="gdata.disabled">
+ </span>
+ </span>
</label>
- <span class="controlled-setting-indicator" pref="gdata.disabled">
- </span>
</div>
</if>
<div id="auto-open-file-types-section" hidden>
@@ -656,17 +681,19 @@
i18n-content="cloudPrintDevicesPageButton">
</button>
- <div class="checkbox controlled-setting-with-label"
+ <div class="settings-row checkbox controlled-setting-with-label"
i18n-values=".hidden: cloudPrintHideNotificationsCheckbox">
<label>
<input id="local-discovery-notifications-enabled"
pref="local_discovery.notifications_enabled"
type="checkbox"
metric="LocalDiscoveryNotificationsDisabled_Settings">
- <span i18n-content="cloudPrintEnableNotificationsLabel"></span>
+ <span>
+ <span i18n-content="cloudPrintEnableNotificationsLabel"></span>
+ <span class="controlled-setting-indicator"
+ pref="local_discovery.notifications_enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="local_discovery.notifications_enabled"></span>
</div>
</section>
</if>
@@ -687,10 +714,12 @@
<input
pref="settings.a11y.enable_menu" type="checkbox"
metric="Options_AccessibilitySystemMenu">
- <span i18n-content="accessibilityAlwaysShowMenu"></span>
+ <span>
+ <span i18n-content="accessibilityAlwaysShowMenu"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.enable_menu"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.a11y.enable_menu"></span>
</div>
</div>
<div class="option-name">
@@ -699,10 +728,12 @@
<input
pref="settings.a11y.large_cursor_enabled" type="checkbox"
metric="Options_AccessibilityLargeMouseCursor">
- <span i18n-content="accessibilityLargeCursor"></span>
+ <span>
+ <span i18n-content="accessibilityLargeCursor"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.large_cursor_enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.a11y.large_cursor_enabled"></span>
</div>
</div>
<div class="option-name">
@@ -711,11 +742,12 @@
<input id="accessibility-high-contrast-check"
pref="settings.a11y.high_contrast_enabled" type="checkbox"
metric="Options_AccessibilityHighContrastMode">
- <span i18n-content="accessibilityHighContrast"></span>
+ <span>
+ <span i18n-content="accessibilityHighContrast"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.high_contrast_enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.a11y.high_contrast_enabled">
- </span>
</div>
</div>
<div id="accessibility-sticky-keys" class="option-name">
@@ -724,11 +756,12 @@
<input id="accessibility-sticky-keys-check"
pref="settings.a11y.sticky_keys_enabled" type="checkbox"
metric="Options_AccessibilityStickyKeys">
- <span i18n-content="accessibilityStickyKeys"></span>
+ <span>
+ <span i18n-content="accessibilityStickyKeys"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.sticky_keys_enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.a11y.sticky_keys_enabled"></span>
- </span>
</div>
</div>
<div class="option-name">
@@ -737,11 +770,12 @@
<input id="accessibility-spoken-feedback-check"
pref="settings.accessibility" type="checkbox"
metric="Options_AccessibilitySpokenFeedback">
- <span i18n-content="accessibilitySpokenFeedback"></span>
+ <span>
+ <span i18n-content="accessibilitySpokenFeedback"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.accessibility"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.accessibility">
- </span>
<div id="accessibility-settings" hidden>
<button id="accessibility-settings-button"
i18n-content="accessibilitySettings"></button>
@@ -750,21 +784,24 @@
</div>
<div class="option-name">
<div class="checkbox controlled-setting-with-label">
+ <label>
<input
pref="settings.a11y.screen_magnifier" type="checkbox"
metric="Options_AccessibilityScreenMagnifier">
- <span i18n-content="accessibilityScreenMagnifier"></span>
+ <span>
+ <span i18n-content="accessibilityScreenMagnifier"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.screen_magnifier"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.a11y.screen_magnifier"></span>
</div>
</div>
<div class="option-name" id="accessibility-tap-dragging">
<div class="checkbox">
<label>
<input id="accessibility-tap-dragging-check"
- pref="settings.touchpad.enable_tap_dragging" type="checkbox"
- metric="Options_AccessibilityTapDragging">
+ pref="settings.touchpad.enable_tap_dragging" type="checkbox"
+ metric="Options_AccessibilityTapDragging">
<span i18n-content="accessibilityTapDragging"></span>
</label>
</div>
@@ -774,10 +811,12 @@
<label>
<input id="accessibility-autoclick-check"
pref="settings.a11y.autoclick" type="checkbox">
- <span i18n-content="accessibilityAutoclick"></span>
+ <span>
+ <span i18n-content="accessibilityAutoclick"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.autoclick"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.a11y.autoclick"></span>
</div>
<div class="checkbox">
<!-- No whitespace between elements. -->
@@ -808,11 +847,12 @@
<label>
<input pref="settings.a11y.virtual_keyboard" type="checkbox"
metric="Options_AccessibilityOnScreenKeyboard">
- <span i18n-content="accessibilityVirtualKeyboard"></span>
+ <span>
+ <span i18n-content="accessibilityVirtualKeyboard"></span>
+ <span class="controlled-setting-indicator"
+ pref="settings.a11y.virtual_keyboard"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="settings.a11y.virtual_keyboard">
- </span>
</div>
</div>
</section>
@@ -837,10 +877,12 @@
<label>
<input pref="background_mode.enabled"
type="checkbox">
- <span i18n-content="backgroundModeCheckbox"></span>
+ <span>
+ <span i18n-content="backgroundModeCheckbox"></span>
+ <span class="controlled-setting-indicator"
+ pref="background_mode.enabled"></span>
+ </span>
</label>
- <span class="controlled-setting-indicator"
- pref="background_mode.enabled"></span>
</div>
</if>
<div class="checkbox controlled-setting-with-label">
« no previous file with comments | « no previous file | chrome/browser/resources/options/content_settings.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698