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

Side by Side Diff: chrome/browser/resources/settings/system_page/system_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/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
3 <link rel="import" href="/controls/controlled_button.html"> 4 <link rel="import" href="/controls/controlled_button.html">
4 <link rel="import" href="/controls/extension_controlled_indicator.html"> 5 <link rel="import" href="/controls/extension_controlled_indicator.html">
5 <link rel="import" href="/controls/settings_checkbox.html"> 6 <link rel="import" href="/controls/settings_toggle_button.html">
6 <link rel="import" href="/lifetime_browser_proxy.html"> 7 <link rel="import" href="/lifetime_browser_proxy.html">
7 <link rel="import" href="/prefs/prefs.html"> 8 <link rel="import" href="/prefs/prefs.html">
8 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
9 <link rel="import" href="/system_page/system_page_browser_proxy.html"> 10 <link rel="import" href="/system_page/system_page_browser_proxy.html">
10 11
11 <dom-module id="settings-system-page"> 12 <dom-module id="settings-system-page">
12 <template> 13 <template>
13 <style include="settings-shared"> 14 <style include="settings-shared">
14 /* TODO(dbeam): is it worth generalizing this style? Does something like 15 .inherit-min-height {
15 * this already exist (buttons after a checkbox in the same row)? */
16 #hardware-acceleration {
17 align-items: center;
18 display: flex;
19 }
20
21 #hardware-acceleration settings-checkbox {
22 flex: 1;
23 }
24
25 .proxy-wrapper {
26 align-items: center;
27 display: flex;
28 min-height: inherit; 16 min-height: inherit;
29 } 17 }
30 18
31 extension-controlled-indicator { 19 extension-controlled-indicator {
32 width: 100%; 20 width: 100%;
33 } 21 }
34 </style> 22 </style>
35 <div class="settings-box block first"> 23 <div class="settings-box block first">
36 <if expr="not is_macosx"> 24 <if expr="not is_macosx">
dschuyler 2017/01/05 20:25:05 After the div on line 30 is moved (mentioned in th
Dan Beam 2017/01/06 02:45:30 see: https://codereview.chromium.org/2615613007
37 <settings-checkbox label="$i18n{backgroundAppsLabel}" 25 <settings-toggle-button
38 pref="{{prefs.background_mode.enabled}}"> 26 pref="{{prefs.background_mode.enabled}}"
39 </settings-checkbox> 27 label="$i18n{backgroundAppsLabel}">
28 </settings-toggle-button>
40 </if> 29 </if>
41 <div id="hardware-acceleration"> 30 <div class="layout horizontal center">
dschuyler 2017/01/05 20:25:05 This could be moved out of the div on line 23. The
Dan Beam 2017/01/06 02:45:30 see: https://codereview.chromium.org/2615613007
42 <settings-checkbox label="$i18n{hardwareAccelerationLabel}" 31 <settings-toggle-button class="flex"
43 pref="{{prefs.hardware_acceleration_mode.enabled}}"> 32 pref="{{prefs.hardware_acceleration_mode.enabled}}"
44 </settings-checkbox> 33 label="$i18n{hardwareAccelerationLabel}">
45 <template is="dom-if" if="[[shouldShowRestart_( 34 <template is="dom-if" if="[[shouldShowRestart_(
46 prefs.hardware_acceleration_mode.enabled.value)]]"> 35 prefs.hardware_acceleration_mode.enabled.value)]]">
47 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> 36 <paper-button class="more-actions" on-tap="onRestartTap_">
48 </template> 37 $i18n{restart}
38 </paper-button>
39 </template>
40 </settings-toggle-button>
49 </div> 41 </div>
50 </div> 42 </div>
51 <div class="settings-box block"> 43 <div class="settings-box block">
52 <div class="proxy-wrapper"> 44 <div class="layout horizontal center inherit-min-height">
53 <controlled-button class="primary-button" pref="[[prefs.proxy]]" 45 <controlled-button class="primary-button" pref="[[prefs.proxy]]"
54 on-tap="onChangeProxySettingsTap_"> 46 on-tap="onChangeProxySettingsTap_">
55 $i18n{changeProxySettings} 47 $i18n{changeProxySettings}
56 </controlled-button> 48 </controlled-button>
57 </div> 49 </div>
58 <template is="dom-if" if="[[prefs.proxy.extensionId]]"> 50 <template is="dom-if" if="[[prefs.proxy.extensionId]]">
59 <div class="proxy-wrapper"> 51 <div class="layout horizontal center inherit-min-height">
dschuyler 2017/01/05 20:25:05 It looks like the "block" should be removed on lin
Dan Beam 2017/01/06 02:45:30 see: https://codereview.chromium.org/2615613007
60 <extension-controlled-indicator 52 <extension-controlled-indicator
61 extension-id="[[prefs.proxy.extensionId]]" 53 extension-id="[[prefs.proxy.extensionId]]"
62 extension-name="[[prefs.proxy.controlledByName]]" 54 extension-name="[[prefs.proxy.controlledByName]]"
63 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]" 55 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"
64 on-extension-disable="onExtensionDisable_"> 56 on-extension-disable="onExtensionDisable_">
65 </extension-controlled-indicator> 57 </extension-controlled-indicator>
66 </div> 58 </div>
67 </template> 59 </template>
68 </div> 60 </div>
69 </template> 61 </template>
70 <script src="/system_page/system_page.js"></script> 62 <script src="/system_page/system_page.js"></script>
71 </dom-module> 63 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698