Skip to content

GitLab

T
tangled
Commit 8b2bcd76 authored by estade's avatar estade Committed by Commit bot
Browse files
Options

reland ce80b519 with fix for failed test. 

Fix some more for= usage.

Also fix some controlled settings indicators.

BUG=409938
R=dbeam@chromium.org

Review URL: https://codereview.chromium.org/572853007

Cr-Commit-Position: refs/heads/master@{#295201}
parent c011630e
Hide whitespace changes
Inline Side-by-side
Showing with 354 additions and 271 deletions
chrome/browser/resources/options/browser_options.html
View file @ 8b2bcd76
...@@ -60,10 +60,12 @@ ...@@ -60,10 +60,12 @@
<input type="checkbox" <input type="checkbox"
pref="browser.show_home_button" pref="browser.show_home_button"
metric="Options_Homepage_HomeButton"> 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> </label>
<span class="controlled-setting-indicator"
pref="browser.show_home_button"></span>
</div> </div>
<div id="change-home-page-section" hidden> <div id="change-home-page-section" hidden>
<div id="change-home-page-section-container" guest-visibility="disabled"> <div id="change-home-page-section-container" guest-visibility="disabled">
...@@ -81,11 +83,12 @@ ...@@ -81,11 +83,12 @@
<input type="checkbox" <input type="checkbox"
pref="bookmark_bar.show_on_all_tabs" pref="bookmark_bar.show_on_all_tabs"
metric="Options_ShowBookmarksBar"> 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> </label>
<span class="controlled-setting-indicator"
pref="bookmark_bar.show_on_all_tabs">
</span>
</div> </div>
<if expr="is_posix and not chromeos and not is_macosx"> <if expr="is_posix and not chromeos and not is_macosx">
<div class="checkbox"><label> <div class="checkbox"><label>
...@@ -291,32 +294,36 @@ ...@@ -291,32 +294,36 @@
<input id="alternateErrorPagesEnabled" <input id="alternateErrorPagesEnabled"
pref="alternate_error_pages.enabled" pref="alternate_error_pages.enabled"
metric="Options_LinkDoctorCheckbox" type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="alternate_error_pages.enabled">
</span>
</div> </div>
<div class="checkbox controlled-setting-with-label" <div class="checkbox controlled-setting-with-label"
guest-visibility="disabled"> guest-visibility="disabled">
<label> <label>
<input pref="search.suggest_enabled" <input pref="search.suggest_enabled"
metric="Options_UseSuggestCheckbox" type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="search.suggest_enabled">
</span>
</div> </div>
<div class="checkbox" guest-visibility="disabled"> <div class="checkbox" guest-visibility="disabled">
<span class="controlled-setting-with-label"> <span class="controlled-setting-with-label">
<label> <label>
<input id="networkPredictionOptions" <input id="networkPredictionOptions"
metric="Options_DnsPrefetchCheckbox" type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="net.network_prediction_options"></span>
</span> </span>
</div> </div>
<div class="checkbox controlled-setting-with-label"> <div class="checkbox controlled-setting-with-label">
...@@ -325,21 +332,23 @@ ...@@ -325,21 +332,23 @@
metric="Options_SafeBrowsingExtendedReportingCheckbox" metric="Options_SafeBrowsingExtendedReportingCheckbox"
pref="safebrowsing.extended_reporting_enabled" pref="safebrowsing.extended_reporting_enabled"
type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="safebrowsing.extended_reporting_enabled">
</span>
</div> </div>
<div class="checkbox controlled-setting-with-label"> <div class="checkbox controlled-setting-with-label">
<label> <label>
<input pref="safebrowsing.enabled" <input pref="safebrowsing.enabled"
metric="Options_SafeBrowsingCheckbox" type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="safebrowsing.enabled">
</span>
</div> </div>
<if expr="_google_chrome"> <if expr="_google_chrome">
<div class="checkbox controlled-setting-with-label"> <div class="checkbox controlled-setting-with-label">
...@@ -347,12 +356,13 @@ ...@@ -347,12 +356,13 @@
<input id="spelling-enabled-control" type="checkbox" <input id="spelling-enabled-control" type="checkbox"
metric="Options_SpellingServiceCheckbox" metric="Options_SpellingServiceCheckbox"
pref="spellcheck.use_spelling_service" dialog-pref> 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> </label>
<span id="spelling-enabled-indicator"
class="controlled-setting-indicator"
pref="spellcheck.use_spelling_service" dialog-pref>
</span>
</div> </div>
<div id="metricsReportingSetting" <div id="metricsReportingSetting"
class="checkbox controlled-setting-with-label"> class="checkbox controlled-setting-with-label">
...@@ -360,19 +370,22 @@ ...@@ -360,19 +370,22 @@
<label> <label>
<input id="metricsReportingEnabled" <input id="metricsReportingEnabled"
pref="cros.metrics.reportingEnabled" type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="cros.metrics.reportingEnabled"></span>
</if> </if>
<if expr="not chromeos"> <if expr="not chromeos">
<label> <label>
<input id="metricsReportingEnabled" type="checkbox"> <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> </label>
<span id="metrics-reporting-disabled-icon"
class="controlled-setting-indicator">
</span>
<span id="metrics-reporting-reset-restart"> <span id="metrics-reporting-reset-restart">
<!-- Text filled by JavaScript --> <!-- Text filled by JavaScript -->
<span></span><button class= <span></span><button class=
...@@ -393,14 +406,16 @@ ...@@ -393,14 +406,16 @@
<label> <label>
<input id="content-protection-attestation-enabled" type="checkbox" <input id="content-protection-attestation-enabled" type="checkbox"
pref="cros.device.attestation_for_content_protection_enabled"> 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> </label>
<a target="_blank" i18n-content="learnMore" <a target="_blank" i18n-content="learnMore"
i18n-values="href:contentProtectionAttestationLearnMoreURL"> i18n-values="href:contentProtectionAttestationLearnMoreURL">
</a> </a>
<span class="controlled-setting-indicator"
pref="cros.device.attestation_for_content_protection_enabled">
</span>
</div> </div>
</if> </if>
<div id="hotword-search" hidden> <div id="hotword-search" hidden>
...@@ -408,11 +423,12 @@ ...@@ -408,11 +423,12 @@
<label> <label>
<input id="hotword-search-enable" pref="hotword.search_enabled_2" <input id="hotword-search-enable" pref="hotword.search_enabled_2"
metric="Options_HotwordCheckbox" type="checkbox" dialog-pref> 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> </label>
<span id="hotword-search-setting-indicator"
pref="hotword.search_enabled_2" dialog-pref>
</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -451,8 +467,10 @@ ...@@ -451,8 +467,10 @@
<label> <label>
<input id="autofill-enabled" pref="autofill.enabled" <input id="autofill-enabled" pref="autofill.enabled"
metric="Options_FormAutofill" type="checkbox"> metric="Options_FormAutofill" type="checkbox">
<span i18n-content="autofillEnabled"></span> <span>
<span class="controlled-setting-indicator" pref="autofill.enabled"> <span i18n-content="autofillEnabled"></span>
<span class="controlled-setting-indicator" pref="autofill.enabled">
</span>
</span> </span>
</label> </label>
<button id="autofill-settings" class="link-button" <button id="autofill-settings" class="link-button"
...@@ -464,9 +482,10 @@ ...@@ -464,9 +482,10 @@
<input id="password-manager-enabled" <input id="password-manager-enabled"
pref="profile.password_manager_enabled" pref="profile.password_manager_enabled"
metric="Options_PasswordManager" type="checkbox"> metric="Options_PasswordManager" type="checkbox">
<span i18n-content="passwordManagerEnabled"></span> <span>
<span class="controlled-setting-indicator" <span i18n-content="passwordManagerEnabled"></span>
pref="profile.password_manager_enabled"></span> <span class="controlled-setting-indicator"
pref="profile.password_manager_enabled"></span>
</span> </span>
</label> </label>
<button id="manage-passwords" class="link-button" <button id="manage-passwords" class="link-button"
...@@ -481,7 +500,7 @@ ...@@ -481,7 +500,7 @@
<h3 i18n-content="easyUnlockSectionTitle"></h3> <h3 i18n-content="easyUnlockSectionTitle"></h3>
<!-- Options shown when the user has not set up Easy Unlock --> <!-- Options shown when the user has not set up Easy Unlock -->
<div id='easy-unlock-setup' hidden> <div id='easy-unlock-setup' hidden>
<div class="controlled-setting-with-label"> <div class="settings-row">
<span i18n-content="easyUnlockSetupIntro"></span> <span i18n-content="easyUnlockSetupIntro"></span>
<a target="_blank" i18n-content="learnMore" <a target="_blank" i18n-content="learnMore"
i18n-values="href:easyUnlockLearnMoreURL"></a> i18n-values="href:easyUnlockLearnMoreURL"></a>
...@@ -491,7 +510,7 @@ ...@@ -491,7 +510,7 @@
</div> </div>
<!-- Options shown when the user has set up Easy Unlock --> <!-- Options shown when the user has set up Easy Unlock -->
<div id='easy-unlock-enable' hidden> <div id='easy-unlock-enable' hidden>
<div class="controlled-setting-with-label"> <div class="settings-row">
<span i18n-content="easyUnlockDescription"></span> <span i18n-content="easyUnlockDescription"></span>
<a target="_blank" i18n-content="learnMore" <a target="_blank" i18n-content="learnMore"
i18n-values="href:easyUnlockLearnMoreURL"></a> i18n-values="href:easyUnlockLearnMoreURL"></a>
...@@ -572,10 +591,12 @@ ...@@ -572,10 +591,12 @@
<label> <label>
<input pref="translate.enabled" <input pref="translate.enabled"
metric="Options_Translate" type="checkbox"> 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> </label>
<span class="controlled-setting-indicator" pref="translate.enabled">
</span>
<button id="manage-languages" class="link-button" <button id="manage-languages" class="link-button"
i18n-content="manageLanguages"></button> i18n-content="manageLanguages"></button>
</div> </div>
...@@ -603,10 +624,12 @@ ...@@ -603,10 +624,12 @@
<input type="checkbox" <input type="checkbox"
pref="download.prompt_for_download" pref="download.prompt_for_download"
metric="Options_AskForSaveLocation"> 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> </label>
<span class="controlled-setting-indicator"
pref="download.prompt_for_download"></span>
</div> </div>
<if expr="chromeos"> <if expr="chromeos">
<div class="checkbox controlled-setting-with-label" <div class="checkbox controlled-setting-with-label"
...@@ -615,10 +638,12 @@ ...@@ -615,10 +638,12 @@
<input type="checkbox" <input type="checkbox"
pref="gdata.disabled" pref="gdata.disabled"
metric="Options_DisableGData"> 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> </label>
<span class="controlled-setting-indicator" pref="gdata.disabled">
</span>
</div> </div>
</if> </if>
<div id="auto-open-file-types-section" hidden> <div id="auto-open-file-types-section" hidden>
...@@ -656,17 +681,19 @@ ...@@ -656,17 +681,19 @@
i18n-content="cloudPrintDevicesPageButton"> i18n-content="cloudPrintDevicesPageButton">
</button> </button>
<div class="checkbox controlled-setting-with-label" <div class="settings-row checkbox controlled-setting-with-label"
i18n-values=".hidden: cloudPrintHideNotificationsCheckbox"> i18n-values=".hidden: cloudPrintHideNotificationsCheckbox">
<label> <label>
<input id="local-discovery-notifications-enabled" <input id="local-discovery-notifications-enabled"
pref="local_discovery.notifications_enabled" pref="local_discovery.notifications_enabled"
type="checkbox" type="checkbox"
metric="LocalDiscoveryNotificationsDisabled_Settings"> 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> </label>
<span class="controlled-setting-indicator"
pref="local_discovery.notifications_enabled"></span>
</div> </div>
</section> </section>
</if> </if>
...@@ -687,10 +714,12 @@ ...@@ -687,10 +714,12 @@
<input <input
pref="settings.a11y.enable_menu" type="checkbox" pref="settings.a11y.enable_menu" type="checkbox"
metric="Options_AccessibilitySystemMenu"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.a11y.enable_menu"></span>
</div> </div>
</div> </div>
<div class="option-name"> <div class="option-name">
...@@ -699,10 +728,12 @@ ...@@ -699,10 +728,12 @@
<input <input
pref="settings.a11y.large_cursor_enabled" type="checkbox" pref="settings.a11y.large_cursor_enabled" type="checkbox"
metric="Options_AccessibilityLargeMouseCursor"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.a11y.large_cursor_enabled"></span>
</div> </div>
</div> </div>
<div class="option-name"> <div class="option-name">
...@@ -711,11 +742,12 @@ ...@@ -711,11 +742,12 @@
<input id="accessibility-high-contrast-check" <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"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.a11y.high_contrast_enabled">
</span>
</div> </div>
</div> </div>
<div id="accessibility-sticky-keys" class="option-name"> <div id="accessibility-sticky-keys" class="option-name">
...@@ -724,11 +756,12 @@ ...@@ -724,11 +756,12 @@
<input id="accessibility-sticky-keys-check" <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"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.a11y.sticky_keys_enabled"></span>
</span>
</div> </div>
</div> </div>
<div class="option-name"> <div class="option-name">
...@@ -737,11 +770,12 @@ ...@@ -737,11 +770,12 @@
<input id="accessibility-spoken-feedback-check" <input id="accessibility-spoken-feedback-check"
pref="settings.accessibility" type="checkbox" pref="settings.accessibility" type="checkbox"
metric="Options_AccessibilitySpokenFeedback"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.accessibility">
</span>
<div id="accessibility-settings" hidden> <div id="accessibility-settings" hidden>
<button id="accessibility-settings-button" <button id="accessibility-settings-button"
i18n-content="accessibilitySettings"></button> i18n-content="accessibilitySettings"></button>
...@@ -750,21 +784,24 @@ ...@@ -750,21 +784,24 @@
</div> </div>
<div class="option-name"> <div class="option-name">
<div class="checkbox controlled-setting-with-label"> <div class="checkbox controlled-setting-with-label">
<label>
<input <input
pref="settings.a11y.screen_magnifier" type="checkbox" pref="settings.a11y.screen_magnifier" type="checkbox"
metric="Options_AccessibilityScreenMagnifier"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.a11y.screen_magnifier"></span>
</div> </div>
</div> </div>
<div class="option-name" id="accessibility-tap-dragging"> <div class="option-name" id="accessibility-tap-dragging">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input id="accessibility-tap-dragging-check" <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"> metric="Options_AccessibilityTapDragging">
<span i18n-content="accessibilityTapDragging"></span> <span i18n-content="accessibilityTapDragging"></span>
</label> </label>
</div> </div>
...@@ -774,10 +811,12 @@ ...@@ -774,10 +811,12 @@
<label> <label>
<input id="accessibility-autoclick-check" <input id="accessibility-autoclick-check"
pref="settings.a11y.autoclick" type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.a11y.autoclick"></span>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<!-- No whitespace between elements. --> <!-- No whitespace between elements. -->
...@@ -808,11 +847,12 @@ ...@@ -808,11 +847,12 @@
<label> <label>
<input pref="settings.a11y.virtual_keyboard" type="checkbox" <input pref="settings.a11y.virtual_keyboard" type="checkbox"
metric="Options_AccessibilityOnScreenKeyboard"> 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> </label>
<span class="controlled-setting-indicator"
pref="settings.a11y.virtual_keyboard">
</span>
</div> </div>
</div> </div>
</section> </section>
...@@ -837,10 +877,12 @@ ...@@ -837,10 +877,12 @@
<label> <label>
<input pref="background_mode.enabled" <input pref="background_mode.enabled"
type="checkbox"> 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> </label>
<span class="controlled-setting-indicator"
pref="background_mode.enabled"></span>
</div> </div>
</if> </if>
<div class="checkbox controlled-setting-with-label"> <div class="checkbox controlled-setting-with-label">
......
chrome/browser/resources/options/content_settings.html
View file @ 8b2bcd76
...@@ -9,35 +9,41 @@ ...@@ -9,35 +9,41 @@
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="cookies" value="allow"> <input type="radio" name="cookies" value="allow">
<span i18n-content="cookiesAllow"></span> <span>
<span i18n-content="cookiesAllow"></span>
<span class="controlled-setting-indicator"
content-setting="cookies" value="allow"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="cookies" value="allow"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="cookies" value="session"> <input type="radio" name="cookies" value="session">
<span i18n-content="cookies_session_only"></span> <span>
<span i18n-content="cookies_session_only"></span>
<span class="controlled-setting-indicator"
content-setting="cookies" value="session"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="cookies" value="session"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="cookies" value="block"> <input type="radio" name="cookies" value="block">
<span i18n-content="cookiesBlock"></span> <span>
<span i18n-content="cookiesBlock"></span>
<span class="controlled-setting-indicator"
content-setting="cookies" value="block"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="cookies" value="block"></span>
</div> </div>
<div class="checkbox controlled-setting-with-label"> <div class="checkbox controlled-setting-with-label">
<label> <label>
<input pref="profile.block_third_party_cookies" type="checkbox"> <input pref="profile.block_third_party_cookies" type="checkbox">
<span i18n-content="cookies_block_3rd_party"></span> <span>
<span i18n-content="cookies_block_3rd_party"></span>
<span class="controlled-setting-indicator"
pref="profile.block_third_party_cookies"></span>
</label> </label>
<span class="controlled-setting-indicator"
pref="profile.block_third_party_cookies">
</span>
</div> </div>
<!-- TODO(jochen): remove the div with the clear cookies on exit option <!-- TODO(jochen): remove the div with the clear cookies on exit option
once this has shipped. --> once this has shipped. -->
...@@ -76,18 +82,19 @@ ...@@ -76,18 +82,19 @@
<label> <label>
<input type="radio" name="images" value="allow"> <input type="radio" name="images" value="allow">
<span i18n-content="imagesAllow"></span> <span i18n-content="imagesAllow"></span>
<span class="controlled-setting-indicator"
content-setting="images" value="allow"></span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="images" value="allow"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="images" value="block"> <input type="radio" name="images" value="block">
<span i18n-content="imagesBlock"></span> <span>
<span i18n-content="imagesBlock"></span>
<span class="controlled-setting-indicator"
content-setting="images" value="block"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="images" value="block">
</span>
</div> </div>
<div class="settings-row"> <div class="settings-row">
<button class="exceptions-list-button" contentType="images" <button class="exceptions-list-button" contentType="images"
...@@ -109,18 +116,22 @@ ...@@ -109,18 +116,22 @@
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="javascript" value="allow"> <input type="radio" name="javascript" value="allow">
<span i18n-content="javascriptAllow"></span> <span>
<span i18n-content="javascriptAllow"></span>
<span class="controlled-setting-indicator"
content-setting="javascript" value="allow"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="javascript" value="allow"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="javascript" value="block"> <input type="radio" name="javascript" value="block">
<span i18n-content="javascriptBlock"></span> <span>
<span i18n-content="javascriptBlock"></span>
<span class="controlled-setting-indicator"
content-setting="javascript" value="block"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="javascript" value="block"></span>
</div> </div>
<div class="settings-row"> <div class="settings-row">
<button class="exceptions-list-button" contentType="javascript" <button class="exceptions-list-button" contentType="javascript"
...@@ -166,26 +177,32 @@ ...@@ -166,26 +177,32 @@
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="plugins" value="allow"> <input type="radio" name="plugins" value="allow">
<span i18n-content="pluginsAllow"></span> <span>
<span i18n-content="pluginsAllow"></span>
<span class="controlled-setting-indicator"
content-setting="plugins" value="allow"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="plugins" value="allow"></span>
</div> </div>
<div id="click_to_play" class="radio controlled-setting-with-label"> <div id="click_to_play" class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="plugins" value="ask"> <input type="radio" name="plugins" value="ask">
<span i18n-content="pluginsAsk"></span> <span>
<span i18n-content="pluginsAsk"></span>
<span class="controlled-setting-indicator"
content-setting="plugins" value="ask"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="plugins" value="ask"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="plugins" value="block"> <input type="radio" name="plugins" value="block">
<span i18n-content="pluginsBlock"></span> <span>
<span i18n-content="pluginsBlock"></span>
<span class="controlled-setting-indicator"
content-setting="plugins" value="block"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="plugins" value="block"></span>
</div> </div>
<div class="settings-row"> <div class="settings-row">
<button class="exceptions-list-button" contentType="plugins" <button class="exceptions-list-button" contentType="plugins"
...@@ -211,18 +228,22 @@ ...@@ -211,18 +228,22 @@
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="popups" value="allow"> <input type="radio" name="popups" value="allow">
<span i18n-content="popupsAllow"></span> <span>
<span i18n-content="popupsAllow"></span>
<span class="controlled-setting-indicator"
content-setting="popups" value="allow"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="popups" value="allow"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="popups" value="block"> <input type="radio" name="popups" value="block">
<span i18n-content="popupsBlock"></span> <span>
<span i18n-content="popupsBlock"></span>
<span class="controlled-setting-indicator"
content-setting="popups" value="block"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="popups" value="block"></span>
</div> </div>
<div class="settings-row"> <div class="settings-row">
<button class="exceptions-list-button" contentType="popups" <button class="exceptions-list-button" contentType="popups"
...@@ -244,27 +265,33 @@ ...@@ -244,27 +265,33 @@
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="location" value="allow"> <input type="radio" name="location" value="allow">
<span i18n-content="locationAllow"></span> <span>
<span i18n-content="locationAllow"></span>
<span class="controlled-setting-indicator"
content-setting="location" value="allow"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="location" value="allow"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="location" value="ask"> <input type="radio" name="location" value="ask">
<span i18n-content="locationAsk"></span> <span>
<span i18n-content="locationAsk"></span>
<span class="controlled-setting-indicator"
content-setting="location" value="ask"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="location" value="ask"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="location" <input type="radio" name="location"
value="block"> value="block">
<span i18n-content="locationBlock"></span> <span>
<span i18n-content="locationBlock"></span>
<span class="controlled-setting-indicator"
content-setting="location" value="block"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="location" value="block"></span>
</div> </div>
<if expr="enable_google_now"> <if expr="enable_google_now">
<div class="checkbox controlled-setting-with-label" <div class="checkbox controlled-setting-with-label"
...@@ -273,10 +300,12 @@ ...@@ -273,10 +300,12 @@
<input pref="googlegeolocationaccess.enabled" <input pref="googlegeolocationaccess.enabled"
metric="Options_GoogleGeolocationAccessCheckbox" metric="Options_GoogleGeolocationAccessCheckbox"
type="checkbox"> type="checkbox">
<span i18n-content="googleGeolocationAccessEnable"></span> <span>
<span i18n-content="googleGeolocationAccessEnable"></span>
<span class="controlled-setting-indicator"
pref="googlegeolocationaccess.enabled"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
pref="googlegeolocationaccess.enabled"></span>
</div> </div>
</if> </if>
<div class="settings-row"> <div class="settings-row">
...@@ -299,26 +328,32 @@ ...@@ -299,26 +328,32 @@
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="notifications" value="allow"> <input type="radio" name="notifications" value="allow">
<span i18n-content="notificationsAllow"></span> <span>
<span i18n-content="notificationsAllow"></span>
<span class="controlled-setting-indicator"
content-setting="notifications" value="allow"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="notifications" value="allow"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="notifications" value="ask"> <input type="radio" name="notifications" value="ask">
<span i18n-content="notificationsAsk"></span> <span>
<span i18n-content="notificationsAsk"></span>
<span class="controlled-setting-indicator"
content-setting="notifications" value="ask"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="notifications" value="ask"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="notifications" value="block"> <input type="radio" name="notifications" value="block">
<span i18n-content="notificationsBlock"></span> <span>
<span i18n-content="notificationsBlock"></span>
<span class="controlled-setting-indicator"
content-setting="notifications" value="block"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="notifications" value="block"></span>
</div> </div>
<div class="settings-row"> <div class="settings-row">
<button class="exceptions-list-button" contentType="notifications" <button class="exceptions-list-button" contentType="notifications"
...@@ -414,20 +449,25 @@ ...@@ -414,20 +449,25 @@
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="media-stream" value="ask"> <input type="radio" name="media-stream" value="ask">
<span id="media-stream-ask-label" i18n-content="mediaStreamAsk"> <span>
<span id="media-stream-ask-label" i18n-content="mediaStreamAsk">
</span>
<span class="controlled-setting-indicator"
content-setting="media-stream" value="ask"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="media-stream" value="ask"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input id="media-stream-block" type="radio" name="media-stream" <input id="media-stream-block" type="radio" name="media-stream"
value="block"> value="block">
<span id="media-stream-block-label" i18n-content="mediaStreamBlock"> <span>
<span id="media-stream-block-label"
i18n-content="mediaStreamBlock"></span>
<span class="controlled-setting-indicator"
content-setting="media-stream" value="block"></span>
</span> </span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="media-stream" value="block"></span>
</div> </div>
<div class="settings-row replace-with-website-settings"> <div class="settings-row replace-with-website-settings">
<button class="exceptions-list-button" contentType="media-stream" <button class="exceptions-list-button" contentType="media-stream"
...@@ -482,29 +522,36 @@ ...@@ -482,29 +522,36 @@
<label> <label>
<input type="radio" name="multiple-automatic-downloads" <input type="radio" name="multiple-automatic-downloads"
value="allow"> value="allow">
<span i18n-content="multipleAutomaticDownloadsAllow"></span> <span>
<span i18n-content="multipleAutomaticDownloadsAllow"></span>
<span class="controlled-setting-indicator"
content-setting="multiple-automatic-downloads" value="allow">
</span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="multiple-automatic-downloads" value="allow">
</span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="multiple-automatic-downloads" value="ask"> <input type="radio" name="multiple-automatic-downloads" value="ask">
<span i18n-content="multipleAutomaticDownloadsAsk"></span> <span>
<span i18n-content="multipleAutomaticDownloadsAsk"></span>
<span class="controlled-setting-indicator"
content-setting="multiple-automatic-downloads" value="ask">
</span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="multiple-automatic-downloads" value="ask"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input type="radio" name="multiple-automatic-downloads" <input type="radio" name="multiple-automatic-downloads"
value="block"> value="block">
<span i18n-content="multipleAutomaticDownloadsBlock"></span> <span>
<span i18n-content="multipleAutomaticDownloadsBlock"></span>
<span class="controlled-setting-indicator"
content-setting="multiple-automatic-downloads" value="block">
</span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
content-setting="multiple-automatic-downloads" value="block">
</span>
</div> </div>
<div class="settings-row"> <div class="settings-row">
<button class="exceptions-list-button" <button class="exceptions-list-button"
......
chrome/browser/resources/options/controlled_setting.css
View file @ 8b2bcd76
...@@ -4,13 +4,6 @@ ...@@ -4,13 +4,6 @@
/* Controlled setting indicator and bubble. */ /* Controlled setting indicator and bubble. */
.controlled-setting-with-label {
-webkit-box-align: center;
display: -webkit-box;
padding-bottom: 7px;
padding-top: 7px;
}
.controlled-setting-with-label input + span { .controlled-setting-with-label input + span {
-webkit-box-align: center; -webkit-box-align: center;
-webkit-box-flex: 1; -webkit-box-flex: 1;
...@@ -18,15 +11,10 @@ ...@@ -18,15 +11,10 @@
display: -webkit-box; display: -webkit-box;
} }
.controlled-setting-with-label input:disabled + span label { .controlled-setting-with-label input:disabled + span {
color: #999; color: #999;
} }
.controlled-setting-with-label label {
display: inline;
padding: 0;
}
.controlled-setting-indicator:not([controlled-by]) { .controlled-setting-indicator:not([controlled-by]) {
display: none; display: none;
} }
......
chrome/browser/resources/options/home_page_overlay.html
View file @ 8b2bcd76
...@@ -2,42 +2,38 @@ ...@@ -2,42 +2,38 @@
<div class="close-button"></div> <div class="close-button"></div>
<h1 i18n-content="homePageOverlay"></h1> <h1 i18n-content="homePageOverlay"></h1>
<div class="content-area"> <div class="content-area">
<div class="radio"> <div class="radio controlled-setting-with-label">
<span class="controlled-setting-with-label"> <label>
<input id="homepage-use-ntp" type="radio" name="homepage" <input id="homepage-use-ntp" type="radio" name="homepage"
pref="homepage_is_newtabpage" value="true" pref="homepage_is_newtabpage" value="true"
metric="Options_Homepage_IsNewTabPage" dialog-pref> metric="Options_Homepage_IsNewTabPage" dialog-pref>
<span> <span>
<label for="homepage-use-ntp" i18n-content="homePageUseNewTab"> <span i18n-content="homePageUseNewTab"></span>
</label>
<span class="controlled-setting-indicator" <span class="controlled-setting-indicator"
pref="homepage_is_newtabpage" value="true" dialog-pref> pref="homepage_is_newtabpage" value="true" dialog-pref></span>
</span>
</span> </span>
</span> </label>
</div> </div>
<div class="radio"> <div class="radio controlled-setting-with-label">
<span class="controlled-setting-with-label"> <label>
<input id="homepage-use-url" type="radio" name="homepage" <input id="homepage-use-url" type="radio" name="homepage"
pref="homepage_is_newtabpage" value="false" pref="homepage_is_newtabpage" value="false"
metric="Options_Homepage_IsNewTabPage" dialog-pref> metric="Options_Homepage_IsNewTabPage" dialog-pref>
<span> <span>
<label id="homepage-use-url-label" i18n-content="homePageUseURL" <span id="homepage-use-url-label" i18n-content="homePageUseURL">
for="homepage-use-url">
</label>
<span class="controlled-setting-indicator"
pref="homepage_is_newtabpage" value="false" dialog-pref>
</span>
<input id="homepage-url-field" type="url" data-type="url"
class="weakrtl favicon-cell stretch" pref="homepage"
aria-labelledby="homepage-use-url-label"
metric="Options_Homepage_URL" dialog-pref>
</input>
<span id="homepage-url-field-indicator"
class="controlled-setting-indicator" pref="homepage"
dialog-pref>
</span> </span>
<span class="controlled-setting-indicator"
pref="homepage_is_newtabpage" value="false" dialog-pref></span>
</span> </span>
</label>
<input id="homepage-url-field" type="url" data-type="url"
class="weakrtl favicon-cell stretch" pref="homepage"
aria-labelledby="homepage-use-url-label"
metric="Options_Homepage_URL" dialog-pref>
</input>
<span id="homepage-url-field-indicator"
class="controlled-setting-indicator" pref="homepage"
dialog-pref>
</span> </span>
</div> </div>
</div> </div>
......
chrome/browser/resources/options/hotword_confirm_overlay.html
View file @ 8b2bcd76
...@@ -23,16 +23,12 @@ ...@@ -23,16 +23,12 @@
</div> </div>
</div> </div>
<div id="audio-logging-bar" class="gray-bottom-bar checkbox"> <div id="audio-logging-bar" class="gray-bottom-bar checkbox">
<span class="controlled-setting-with-label"> <label>
<input id="hotword-audio-logging-enable" <input
pref="hotword.audio_logging_enabled" pref="hotword.audio_logging_enabled"
metric="Options_Hotword_AudioLogging_Checkbox" metric="Options_Hotword_AudioLogging_Checkbox"
type="checkbox" dialog-pref checked> type="checkbox" dialog-pref checked>
<span> <span i18n-content="hotwordAudioLoggingEnable"></span>
<label for="hotword-audio-logging-enable" </label>
i18n-content="hotwordAudioLoggingEnable">
</label>
</span>
</span>
</div> </div>
</div> </div>
chrome/browser/resources/options/import_data_overlay.html
View file @ 8b2bcd76
...@@ -15,40 +15,48 @@ ...@@ -15,40 +15,48 @@
id="import-history-with-label"> id="import-history-with-label">
<label> <label>
<input id="import-history" type="checkbox" pref="import_history"> <input id="import-history" type="checkbox" pref="import_history">
<span i18n-content="importHistory"></span> <span>
<span i18n-content="importHistory"></span>
<span class="controlled-setting-indicator" pref="import_history">
</span>
</span>
</label> </label>
<span class="controlled-setting-indicator" pref="import_history">
</span>
</div> </div>
<div class="checkbox controlled-setting-with-label" <div class="checkbox controlled-setting-with-label"
id="import-favorites-with-label"> id="import-favorites-with-label">
<label> <label>
<input id="import-favorites" type="checkbox" <input id="import-favorites" type="checkbox"
pref="import_bookmarks"> pref="import_bookmarks">
<span i18n-content="importFavorites"></span> <span>
<span i18n-content="importFavorites"></span>
<span class="controlled-setting-indicator"
pref="import_bookmarks"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
pref="import_bookmarks"></span>
</div> </div>
<div class="checkbox controlled-setting-with-label" <div class="checkbox controlled-setting-with-label"
id="import-passwords-with-label"> id="import-passwords-with-label">
<label> <label>
<input id="import-passwords" type="checkbox" <input id="import-passwords" type="checkbox"
pref="import_saved_passwords"> pref="import_saved_passwords">
<span i18n-content="importPasswords"></span> <span>
<span i18n-content="importPasswords"></span>
<span class="controlled-setting-indicator"
pref="import_saved_passwords"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
pref="import_saved_passwords"></span>
</div> </div>
<div class="checkbox controlled-setting-with-label" <div class="checkbox controlled-setting-with-label"
id="import-search-with-label"> id="import-search-with-label">
<label> <label>
<input id="import-search" type="checkbox" <input id="import-search" type="checkbox"
pref="import_search_engine"> pref="import_search_engine">
<span i18n-content="importSearch"></span> <span>
<span i18n-content="importSearch"></span>
<span class="controlled-setting-indicator"
pref="import_search_engine"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
pref="import_search_engine"></span>
</div> </div>
<div class="checkbox controlled-setting-with-label" <div class="checkbox controlled-setting-with-label"
id="import-autofill-form-data-with-label"> id="import-autofill-form-data-with-label">
...@@ -76,10 +84,12 @@ ...@@ -76,10 +84,12 @@
<input id="import-data-show-bookmarks-bar" <input id="import-data-show-bookmarks-bar"
pref="bookmark_bar.show_on_all_tabs" pref="bookmark_bar.show_on_all_tabs"
metric="Options_ShowBookmarksBar" type="checkbox"> metric="Options_ShowBookmarksBar" type="checkbox">
<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> </label>
<span class="controlled-setting-indicator"
pref="bookmark_bar.show_on_all_tabs"></span>
</div> </div>
</div> </div>
</div> </div>
......
chrome/browser/resources/options/language_add_language_overlay.html
View file @ 8b2bcd76
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
<div class="close-button"></div> <div class="close-button"></div>
<h1 i18n-content="addLanguageTitle"></h1> <h1 i18n-content="addLanguageTitle"></h1>
<div class="content-area"> <div class="content-area">
<label for="add-language-overlay-language-list" <label id="add-language-overlay-language-list-label"
i18n-content="addLanguageSelectLabel"></label> i18n-content="addLanguageSelectLabel"></label>
<select id="add-language-overlay-language-list"></select> <select id="add-language-overlay-language-list"
aria-labelledby="add-language-overlay-language-list-label"></select>
</div> </div>
<div class="action-area button-strip"> <div class="action-area button-strip">
<button id="add-language-overlay-cancel-button" i18n-content="cancel"> <button id="add-language-overlay-cancel-button" i18n-content="cancel">
......
chrome/browser/resources/options/manage_profile_overlay.html
View file @ 8b2bcd76
...@@ -10,9 +10,7 @@ ...@@ -10,9 +10,7 @@
<grid id="manage-profile-icon-grid"></grid> <grid id="manage-profile-icon-grid"></grid>
<div id="manage-profile-name-input-container"> <div id="manage-profile-name-input-container">
<label> <label>
<span id="manage-profile-name-label" for="manage-profile-name" <span i18n-content="manageProfilesNameLabel"></span>
i18n-content="manageProfilesNameLabel">
</span>
<input id="manage-profile-name" type="text" pattern=".*\S.*" required> <input id="manage-profile-name" type="text" pattern=".*\S.*" required>
</label> </label>
</div> </div>
...@@ -83,7 +81,7 @@ ...@@ -83,7 +81,7 @@
<grid id="create-profile-icon-grid"></grid> <grid id="create-profile-icon-grid"></grid>
<div id="create-profile-name-input-container"> <div id="create-profile-name-input-container">
<label> <label>
<span id="create-profile-name-label" for="create-profile-name" <span id="create-profile-name-label"
i18n-content="manageProfilesNameLabel"> i18n-content="manageProfilesNameLabel">
</span> </span>
<input id="create-profile-name" type="text" pattern=".*\S.*" required> <input id="create-profile-name" type="text" pattern=".*\S.*" required>
...@@ -94,9 +92,7 @@ ...@@ -94,9 +92,7 @@
<div id="create-shortcut-container" class="checkbox" hidden> <div id="create-shortcut-container" class="checkbox" hidden>
<label> <label>
<input id="create-shortcut" type="checkbox"> <input id="create-shortcut" type="checkbox">
<span for="create-shortcut" <span i18n-content="createProfileShortcutCheckbox"></span>
i18n-content="createProfileShortcutCheckbox">
</span>
</label> </label>
</div> </div>
<div id="create-profile-supervised-container" class="checkbox"> <div id="create-profile-supervised-container" class="checkbox">
......
chrome/browser/resources/options/reset_profile_settings_overlay.css
View file @ 8b2bcd76
...@@ -48,15 +48,13 @@ ...@@ -48,15 +48,13 @@
} }
#expand-feedback { #expand-feedback {
background: center bottom no-repeat; background: url('chrome://theme/IDR_QUESTION_MARK') no-repeat center;
background-image: url('chrome://theme/IDR_QUESTION_MARK');
display: inline-block; display: inline-block;
height: 14px; height: 14px;
opacity: 0.33; opacity: 0.33;
vertical-align: text-top;
width: 14px; width: 14px;
} }
#expand-feedback:hover { #expand-feedback:hover {
opacity: 1; opacity: 1;
} }
\ No newline at end of file
chrome/browser/resources/options/reset_profile_settings_overlay.html
View file @ 8b2bcd76
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
</div> </div>
</div> </div>
</div> </div>
<div id="feedback-bar" class="gray-bottom-bar checkbox"> <div id="feedback-bar"
<span class="controlled-setting-with-label"> class="gray-bottom-bar checkbox controlled-setting-with-label">
<label>
<input id="send-settings" type="checkbox" checked> <input id="send-settings" type="checkbox" checked>
<span> <span>
<label for="send-settings" i18n-content="resetProfileSettingsFeedback"> <span i18n-content="resetProfileSettingsFeedback"></span>
</label> <span id="expand-feedback"></span>
<div id='expand-feedback'></div>
</span> </span>
</span> </label>
<div id="feedback-template" hidden> <div id="feedback-template" hidden>
<div> <div>
<table> <table>
......
chrome/browser/resources/options/reset_profile_settings_overlay.js
View file @ 8b2bcd76
...@@ -28,17 +28,18 @@ cr.define('options', function() { ...@@ -28,17 +28,18 @@ cr.define('options', function() {
initializePage: function() { initializePage: function() {
Page.prototype.initializePage.call(this); Page.prototype.initializePage.call(this);
$('reset-profile-settings-dismiss').onclick = function(event) { $('reset-profile-settings-dismiss').onclick = function(e) {
ResetProfileSettingsOverlay.dismiss(); ResetProfileSettingsOverlay.dismiss();
}; };
$('reset-profile-settings-commit').onclick = function(event) { $('reset-profile-settings-commit').onclick = function(e) {
ResetProfileSettingsOverlay.setResettingState(true); ResetProfileSettingsOverlay.setResettingState(true);
chrome.send('performResetProfileSettings', chrome.send('performResetProfileSettings',
[$('send-settings').checked]); [$('send-settings').checked]);
}; };
$('expand-feedback').onclick = function(event) { $('expand-feedback').onclick = function(e) {
var feedbackTemplate = $('feedback-template'); var feedbackTemplate = $('feedback-template');
feedbackTemplate.hidden = !feedbackTemplate.hidden; feedbackTemplate.hidden = !feedbackTemplate.hidden;
e.preventDefault();
}; };
}, },
......
chrome/browser/resources/options/startup_section.html
View file @ 8b2bcd76
...@@ -7,30 +7,36 @@ ...@@ -7,30 +7,36 @@
<input type="radio" name="startup" value="5" <input type="radio" name="startup" value="5"
pref="session.restore_on_startup" pref="session.restore_on_startup"
metric="Options_Startup_NewTab"> metric="Options_Startup_NewTab">
<span i18n-content="startupShowNewTab"></span> <span>
<span i18n-content="startupShowNewTab"></span>
<span class="controlled-setting-indicator"
pref="session.restore_on_startup" value="5"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
pref="session.restore_on_startup" value="5"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input id="startup-restore-session" type="radio" name="startup" <input id="startup-restore-session" type="radio" name="startup"
value="1" pref="session.restore_on_startup" value="1" pref="session.restore_on_startup"
metric="Options_Startup_LastSession"> metric="Options_Startup_LastSession">
<span i18n-content="startupRestoreLastSession"></span> <span>
<span i18n-content="startupRestoreLastSession"></span>
<span class="controlled-setting-indicator"
pref="session.restore_on_startup" value="1"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
pref="session.restore_on_startup" value="1"></span>
</div> </div>
<div class="radio controlled-setting-with-label"> <div class="radio controlled-setting-with-label">
<label> <label>
<input id="startup-show-pages" type="radio" name="startup" <input id="startup-show-pages" type="radio" name="startup"
pref="session.restore_on_startup" pref="session.restore_on_startup"
value="4" metric="Options_Startup_Custom"> value="4" metric="Options_Startup_Custom">
<span i18n-content="startupShowPages"></span> <span>
<span i18n-content="startupShowPages"></span>
<span class="controlled-setting-indicator"
pref="session.restore_on_startup" value="4"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
pref="session.restore_on_startup" value="4"></span>
<button id="startup-set-pages" class="link-button" <button id="startup-set-pages" class="link-button"
i18n-content="startupSetPages"> i18n-content="startupSetPages">
</button> </button>
......
chrome/browser/resources/options/sync_section.html
View file @ 8b2bcd76
...@@ -37,11 +37,13 @@ ...@@ -37,11 +37,13 @@
<input type="checkbox" <input type="checkbox"
metric="Options_ScreenLock" metric="Options_ScreenLock"
pref="settings.enable_screen_lock"> pref="settings.enable_screen_lock">
<span i18n-content="enableScreenlock"></span> <span>
<span i18n-content="enableScreenlock"></span>
<span class="controlled-setting-indicator"
i18n-values="textshared:screenLockShared"
pref="settings.enable_screen_lock"></span>
</span>
</label> </label>
<span class="controlled-setting-indicator"
i18n-values="textshared:screenLockShared"
pref="settings.enable_screen_lock"></span>
</div> </div>
</div> </div>
</if> <!-- chromeos --> </if> <!-- chromeos -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment