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

Side by Side 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html"> 9 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html">
9 <link rel="import" href="/controls/settings_checkbox.html">
10 <link rel="import" href="/controls/settings_toggle_button.html"> 10 <link rel="import" href="/controls/settings_toggle_button.html">
11 <link rel="import" href="/lifetime_browser_proxy.html"> 11 <link rel="import" href="/lifetime_browser_proxy.html">
12 <link rel="import" href="/route.html"> 12 <link rel="import" href="/route.html">
13 <link rel="import" href="/settings_page/settings_animated_pages.html"> 13 <link rel="import" href="/settings_page/settings_animated_pages.html">
14 <link rel="import" href="/settings_page/settings_subpage.html"> 14 <link rel="import" href="/settings_page/settings_subpage.html">
15 <link rel="import" href="/settings_shared_css.html"> 15 <link rel="import" href="/settings_shared_css.html">
16 <link rel="import" href="/site_settings/all_sites.html"> 16 <link rel="import" href="/site_settings/all_sites.html">
17 <link rel="import" href="/site_settings/category_default_setting.html"> 17 <link rel="import" href="/site_settings/category_default_setting.html">
18 <link rel="import" href="/site_settings/category_setting_exceptions.html"> 18 <link rel="import" href="/site_settings/category_setting_exceptions.html">
19 <link rel="import" href="/site_settings/constants.html"> 19 <link rel="import" href="/site_settings/constants.html">
(...skipping 11 matching lines...) Expand all
31 </if> 31 </if>
32 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> 32 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html">
33 33
34 <dom-module id="settings-privacy-page"> 34 <dom-module id="settings-privacy-page">
35 <template> 35 <template>
36 <style include="settings-shared"> 36 <style include="settings-shared">
37 button[is='paper-icon-button-light'].icon-help { 37 button[is='paper-icon-button-light'].icon-help {
38 background-image: url(../images/help_outline.svg); 38 background-image: url(../images/help_outline.svg);
39 } 39 }
40 40
41 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow 41 .settings-row-min-height {
42 * combining? */
43 #metricsReporting,
44 #safeBrowsingExtendedReporting {
45 align-items: center;
46 display: flex;
47 min-height: var(--settings-row-min-height); 42 min-height: var(--settings-row-min-height);
48 } 43 }
Dan Beam 2017/01/06 02:45:30 this is being shrunk here: https://codereview.chro
49 44
50 #metricsReportingCheckbox,
51 #safeBrowsingExtendedReportingCheckbox {
52 display: inline-block;
53 }
54
55 #metricsReportingCheckbox:not([disabled]),
56 #safeBrowsingExtendedReportingCheckbox {
57 width: 100%;
58 }
59
60 #metricsReporting paper-tooltip {
61 --paper-tooltip: var(--cr-policy-tooltip);
62 }
63
64 #indicator {
65 -webkit-margin-start: var(--checkbox-spacing);
66 }
67
68 #restart { 45 #restart {
69 flex: 1;
70 text-align: end; 46 text-align: end;
71 } 47 }
72 </style> 48 </style>
73 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> 49 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp>
74 <settings-clear-browsing-data-dialog prefs="{{prefs}}" 50 <settings-clear-browsing-data-dialog prefs="{{prefs}}"
75 on-close="onDialogClosed_"> 51 on-close="onDialogClosed_">
76 </settings-clear-browsing-data-dialog> 52 </settings-clear-browsing-data-dialog>
77 </template> 53 </template>
78 <settings-animated-pages id="pages" section="privacy"> 54 <settings-animated-pages id="pages" section="privacy">
79 <neon-animatable route-path="default"> 55 <neon-animatable route-path="default">
80 <div class="settings-box block first"> 56 <div class="settings-box block first">
81 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p> 57 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p>
82 <settings-checkbox pref="{{prefs.alternate_error_pages.enabled}}" 58 <settings-toggle-button
59 pref="{{prefs.alternate_error_pages.enabled}}"
83 label="$i18n{linkDoctorPref}"> 60 label="$i18n{linkDoctorPref}">
84 </settings-checkbox> 61 </settings-toggle-button>
85 <settings-checkbox pref="{{prefs.search.suggest_enabled}}" 62 <settings-toggle-button
63 pref="{{prefs.search.suggest_enabled}}"
86 label="$i18n{searchSuggestPref}" 64 label="$i18n{searchSuggestPref}"
87 hidden="[[!pageVisibility.searchPrediction]]"> 65 hidden="[[!pageVisibility.searchPrediction]]">
88 </settings-checkbox> 66 </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
89 <settings-checkbox pref="{{prefs.net.network_prediction_options}}" 67 <settings-toggle-button
68 pref="{{prefs.net.network_prediction_options}}"
90 label="$i18n{networkPredictionEnabled}" 69 label="$i18n{networkPredictionEnabled}"
91 hidden="[[!pageVisibility.networkPrediction]]"> 70 hidden="[[!pageVisibility.networkPrediction]]">
92 </settings-checkbox> 71 </settings-toggle-button>
93 <div id="safeBrowsingExtendedReporting"> 72 <div class="layout horizontal center settings-row-min-height">
94 <paper-checkbox id="safeBrowsingExtendedReportingCheckbox" 73 <div class="flex">$i18n{safeBrowsingEnableExtendedReporting}</div>
95 on-tap="onSafeBrowsingExtendedReportingCheckboxTap_" 74 <paper-toggle-button
75 id="safeBrowsingExtendedReportingControl"
76 on-tap="onSafeBrowsingExtendedReportingControlTap_"
96 checked="[[safeBrowsingExtendedReportingEnabled_]]"> 77 checked="[[safeBrowsingExtendedReportingEnabled_]]">
97 $i18n{safeBrowsingEnableExtendedReporting} 78 </paper-toggle-button>
98 </paper-checkbox>
99 </div> 79 </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
100 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" 80 <settings-toggle-button
81 pref="{{prefs.safebrowsing.enabled}}"
101 label="$i18n{safeBrowsingEnableProtection}"> 82 label="$i18n{safeBrowsingEnableProtection}">
102 </settings-checkbox> 83 </settings-toggle-button>
103 <if expr="_google_chrome"> 84 <if expr="_google_chrome">
104 <if expr="chromeos"> 85 <if expr="chromeos">
105 <settings-checkbox pref="{{prefs.cros.metrics.reportingEnabled}}" 86 <settings-toggle-button
87 pref="{{prefs.cros.metrics.reportingEnabled}}"
106 label="$i18n{enableLogging}"> 88 label="$i18n{enableLogging}">
107 </settings-checkbox> 89 </settings-toggle-button>
108 </if><!-- chromeos --> 90 </if><!-- chromeos -->
109 <if expr="not chromeos"> 91 <if expr="not chromeos">
110 <div id="metricsReporting"> 92 <div class="layout horizontal center settings-row-min-height">
111 <paper-checkbox id="metricsReportingCheckbox" 93 <div class="flex">$i18n{enableLogging}</div>
112 on-tap="onMetricsReportingCheckboxTap_" 94 <template is="dom-if" if="[[showRestart_]]" restamp>
113 checked="[[metricsReporting_.enabled]]" 95 <div class="flex" id="restart">
114 disabled="[[metricsReporting_.managed]]"> 96 <paper-button on-tap="onRestartTap_">
115 $i18n{enableLogging} 97 $i18n{restart}
116 </paper-checkbox> 98 </paper-button>
99 </div>
100 </template>
117 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> 101 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp>
118 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> 102 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon>
119 <paper-tooltip for="indicator" position="top" 103 <paper-tooltip for="indicator" position="top"
120 fit-to-visible-bounds> 104 fit-to-visible-bounds>
121 $i18n{controlledSettingPolicy} 105 $i18n{controlledSettingPolicy}
122 </paper-tooltip> 106 </paper-tooltip>
123 </template> 107 </template>
124 <template is="dom-if" if="[[showRestart_]]" restamp> 108 <paper-toggle-button
125 <div id="restart"> 109 on-tap="onMetricsReportingControlTap_"
126 <paper-button on-tap="onRestartTap_"> 110 checked="[[metricsReporting_.enabled]]"
127 $i18n{restart} 111 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
128 </paper-button> 112 </paper-toggle-button>
129 </div>
130 </template>
131 </div> 113 </div>
132 </if><!-- not chromeos --> 114 </if><!-- not chromeos -->
133 </if><!-- _google_chrome --> 115 </if><!-- _google_chrome -->
134 <settings-checkbox pref="{{prefs.enable_do_not_track}}" 116 <settings-toggle-button
117 pref="{{prefs.enable_do_not_track}}"
135 label="$i18n{doNotTrack}"> 118 label="$i18n{doNotTrack}">
136 </settings-checkbox> 119 </settings-toggle-button>
137 <if expr="chromeos"> 120 <if expr="chromeos">
138 <settings-checkbox 121 <settings-toggle-button
139 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" 122 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}"
140 label="$i18n{enableContentProtectionAttestation}"> 123 label="$i18n{enableContentProtectionAttestation}">
141 </settings-checkbox> 124 </settings-toggle-button>
142 <settings-checkbox 125 <settings-toggle-button
143 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" 126 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}"
144 label="$i18n{wakeOnWifi}"> 127 label="$i18n{wakeOnWifi}">
145 </settings-checkbox> 128 </settings-toggle-button>
146 </if> 129 </if>
147 </div> 130 </div>
148 <if expr="_google_chrome"> 131 <if expr="_google_chrome">
149 <div class="settings-box two-line"> 132 <div class="settings-box two-line">
150 <settings-toggle-button class="start" 133 <settings-toggle-button class="start"
151 pref="{{prefs.spellcheck.use_spelling_service}}" 134 pref="{{prefs.spellcheck.use_spelling_service}}"
152 label="$i18n{spellingPref}" 135 label="$i18n{spellingPref}"
153 sub-label="$i18n{spellingDescription}"> 136 sub-label="$i18n{spellingDescription}">
154 </settings-toggle-button> 137 </settings-toggle-button>
155 </div> 138 </div>
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 $i18n{siteSettingsCookieRemoveAll} 378 $i18n{siteSettingsCookieRemoveAll}
396 </paper-button> 379 </paper-button>
397 <site-data-details-subpage page-title="{{pageTitle}}"> 380 <site-data-details-subpage page-title="{{pageTitle}}">
398 </site-data-details-subpage> 381 </site-data-details-subpage>
399 </settings-subpage> 382 </settings-subpage>
400 </template> 383 </template>
401 </settings-animated-pages> 384 </settings-animated-pages>
402 </template> 385 </template>
403 <script src="privacy_page.js"></script> 386 <script src="privacy_page.js"></script>
404 </dom-module> 387 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698