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

Unified Diff: chrome/browser/resources/settings/privacy_page/privacy_page.html

Issue 2617533003: MD Settings: change most checkboxes to toggles (leave dialogs alone) (Closed)
Patch Set: Created 3 years, 11 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
Index: chrome/browser/resources/settings/privacy_page/privacy_page.html
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 76fbc1a6c0e2478739786f2f0e2aaaa92c3220c6..3c7c126cb7f44af161161b2158a0907bc510267d 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -5,8 +5,8 @@
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.html">
-<link rel="import" href="/controls/settings_checkbox.html">
<link rel="import" href="/controls/settings_toggle_button.html">
<link rel="import" href="/lifetime_browser_proxy.html">
<link rel="import" href="/route.html">
@@ -38,35 +38,11 @@
background-image: url(../images/help_outline.svg);
}
- /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow
- * combining? */
- #metricsReporting,
- #safeBrowsingExtendedReporting {
- align-items: center;
- display: flex;
+ .settings-row-min-height {
min-height: var(--settings-row-min-height);
}
Dan Beam 2017/01/06 02:45:30 this is being shrunk here: https://codereview.chro
- #metricsReportingCheckbox,
- #safeBrowsingExtendedReportingCheckbox {
- display: inline-block;
- }
-
- #metricsReportingCheckbox:not([disabled]),
- #safeBrowsingExtendedReportingCheckbox {
- width: 100%;
- }
-
- #metricsReporting paper-tooltip {
- --paper-tooltip: var(--cr-policy-tooltip);
- }
-
- #indicator {
- -webkit-margin-start: var(--checkbox-spacing);
- }
-
#restart {
- flex: 1;
text-align: end;
}
</style>
@@ -79,41 +55,49 @@
<neon-animatable route-path="default">
<div class="settings-box block first">
<p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p>
- <settings-checkbox pref="{{prefs.alternate_error_pages.enabled}}"
+ <settings-toggle-button
+ pref="{{prefs.alternate_error_pages.enabled}}"
label="$i18n{linkDoctorPref}">
- </settings-checkbox>
- <settings-checkbox pref="{{prefs.search.suggest_enabled}}"
+ </settings-toggle-button>
+ <settings-toggle-button
+ pref="{{prefs.search.suggest_enabled}}"
label="$i18n{searchSuggestPref}"
hidden="[[!pageVisibility.searchPrediction]]">
- </settings-checkbox>
- <settings-checkbox pref="{{prefs.net.network_prediction_options}}"
+ </settings-toggle-button>
dschuyler 2017/01/05 20:25:05 Afaik, each toggle would be within a .settings-box
Dan Beam 2017/01/06 02:45:30 let's do that separately because i don't agree
dschuyler 2017/01/10 00:07:53 There was a separate email thread about this, was
Dan Beam 2017/01/11 01:55:48 yes, but we're doing this after
+ <settings-toggle-button
+ pref="{{prefs.net.network_prediction_options}}"
label="$i18n{networkPredictionEnabled}"
hidden="[[!pageVisibility.networkPrediction]]">
- </settings-checkbox>
- <div id="safeBrowsingExtendedReporting">
- <paper-checkbox id="safeBrowsingExtendedReportingCheckbox"
- on-tap="onSafeBrowsingExtendedReportingCheckboxTap_"
+ </settings-toggle-button>
+ <div class="layout horizontal center settings-row-min-height">
+ <div class="flex">$i18n{safeBrowsingEnableExtendedReporting}</div>
+ <paper-toggle-button
+ id="safeBrowsingExtendedReportingControl"
+ on-tap="onSafeBrowsingExtendedReportingControlTap_"
checked="[[safeBrowsingExtendedReportingEnabled_]]">
- $i18n{safeBrowsingEnableExtendedReporting}
- </paper-checkbox>
+ </paper-toggle-button>
</div>
dschuyler 2017/01/05 20:25:05 The div above could probably be converted changed
Dan Beam 2017/01/06 02:45:30 <paper-toggle-button> doesn't have label= property
- <settings-checkbox pref="{{prefs.safebrowsing.enabled}}"
+ <settings-toggle-button
+ pref="{{prefs.safebrowsing.enabled}}"
label="$i18n{safeBrowsingEnableProtection}">
- </settings-checkbox>
+ </settings-toggle-button>
<if expr="_google_chrome">
<if expr="chromeos">
- <settings-checkbox pref="{{prefs.cros.metrics.reportingEnabled}}"
+ <settings-toggle-button
+ pref="{{prefs.cros.metrics.reportingEnabled}}"
label="$i18n{enableLogging}">
- </settings-checkbox>
+ </settings-toggle-button>
</if><!-- chromeos -->
<if expr="not chromeos">
- <div id="metricsReporting">
- <paper-checkbox id="metricsReportingCheckbox"
- on-tap="onMetricsReportingCheckboxTap_"
- checked="[[metricsReporting_.enabled]]"
- disabled="[[metricsReporting_.managed]]">
- $i18n{enableLogging}
- </paper-checkbox>
+ <div class="layout horizontal center settings-row-min-height">
+ <div class="flex">$i18n{enableLogging}</div>
+ <template is="dom-if" if="[[showRestart_]]" restamp>
+ <div class="flex" id="restart">
+ <paper-button on-tap="onRestartTap_">
+ $i18n{restart}
+ </paper-button>
+ </div>
+ </template>
<template is="dom-if" if="[[metricsReporting_.managed]]" restamp>
<iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon>
<paper-tooltip for="indicator" position="top"
@@ -121,28 +105,27 @@
$i18n{controlledSettingPolicy}
</paper-tooltip>
</template>
- <template is="dom-if" if="[[showRestart_]]" restamp>
- <div id="restart">
- <paper-button on-tap="onRestartTap_">
- $i18n{restart}
- </paper-button>
- </div>
- </template>
+ <paper-toggle-button
+ on-tap="onMetricsReportingControlTap_"
+ checked="[[metricsReporting_.enabled]]"
+ disabled="[[metricsReporting_.managed]]">
dschuyler 2017/01/05 20:25:05 Could the label from line 93 be made a label="" he
Dan Beam 2017/01/06 02:45:30 paper-toggle-button != settings-toggle-button
+ </paper-toggle-button>
</div>
</if><!-- not chromeos -->
</if><!-- _google_chrome -->
- <settings-checkbox pref="{{prefs.enable_do_not_track}}"
+ <settings-toggle-button
+ pref="{{prefs.enable_do_not_track}}"
label="$i18n{doNotTrack}">
- </settings-checkbox>
+ </settings-toggle-button>
<if expr="chromeos">
- <settings-checkbox
+ <settings-toggle-button
pref="{{prefs.cros.device.attestation_for_content_protection_enabled}}"
label="$i18n{enableContentProtectionAttestation}">
- </settings-checkbox>
- <settings-checkbox
+ </settings-toggle-button>
+ <settings-toggle-button
pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}"
label="$i18n{wakeOnWifi}">
- </settings-checkbox>
+ </settings-toggle-button>
</if>
</div>
<if expr="_google_chrome">

Powered by Google App Engine
This is Rietveld 408576698