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

Side by Side Diff: chrome/browser/resources/settings/system_page/system_page.html

Issue 2626993003: MD Settings: add borders between toggle rows on basic/advanced pages (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
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/iron-flex-layout/iron-f lex-layout-classes.html">
3 <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">
4 <link rel="import" href="/controls/controlled_button.html"> 4 <link rel="import" href="/controls/controlled_button.html">
5 <link rel="import" href="/controls/extension_controlled_indicator.html"> 5 <link rel="import" href="/controls/extension_controlled_indicator.html">
6 <link rel="import" href="/controls/settings_toggle_button.html"> 6 <link rel="import" href="/controls/settings_toggle_button.html">
7 <link rel="import" href="/lifetime_browser_proxy.html"> 7 <link rel="import" href="/lifetime_browser_proxy.html">
8 <link rel="import" href="/prefs/prefs.html"> 8 <link rel="import" href="/prefs/prefs.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
10 <link rel="import" href="/system_page/system_page_browser_proxy.html"> 10 <link rel="import" href="/system_page/system_page_browser_proxy.html">
11 11
12 <dom-module id="settings-system-page"> 12 <dom-module id="settings-system-page">
13 <template> 13 <template>
14 <style include="settings-shared"></style> 14 <style include="settings-shared"></style>
15 <div class="settings-box block first"> 15 <div class="settings-box first">
16 <if expr="not is_macosx"> 16 <if expr="not is_macosx">
17 <settings-toggle-button 17 <settings-toggle-button class="start"
18 pref="{{prefs.background_mode.enabled}}" 18 pref="{{prefs.background_mode.enabled}}"
19 label="$i18n{backgroundAppsLabel}"> 19 label="$i18n{backgroundAppsLabel}">
20 </settings-toggle-button> 20 </settings-toggle-button>
21 </div>
22 <div class="settings-box">
21 </if> 23 </if>
22 <settings-toggle-button class="flex" id="hardwareAcceleration" 24 <settings-toggle-button class="flex" id="hardwareAcceleration"
dschuyler 2017/01/13 01:48:15 Since this is now in its own settings-box, let's m
Dan Beam 2017/01/13 03:35:44 Done.
23 pref="{{prefs.hardware_acceleration_mode.enabled}}" 25 pref="{{prefs.hardware_acceleration_mode.enabled}}"
24 label="$i18n{hardwareAccelerationLabel}"> 26 label="$i18n{hardwareAccelerationLabel}">
25 <template is="dom-if" if="[[shouldShowRestart_( 27 <template is="dom-if" if="[[shouldShowRestart_(
26 prefs.hardware_acceleration_mode.enabled.value)]]"> 28 prefs.hardware_acceleration_mode.enabled.value)]]">
27 <paper-button on-tap="onRestartTap_" class="more-actions"> 29 <paper-button on-tap="onRestartTap_" class="more-actions">
28 $i18n{restart} 30 $i18n{restart}
29 </paper-button> 31 </paper-button>
30 </template> 32 </template>
31 </settings-toggle-button> 33 </settings-toggle-button>
32 </div> 34 </div>
33 <div class="settings-box"> 35 <div class="settings-box">
34 <controlled-button class="primary-button" pref="[[prefs.proxy]]" 36 <controlled-button class="primary-button" pref="[[prefs.proxy]]"
35 on-tap="onChangeProxySettingsTap_"> 37 on-tap="onChangeProxySettingsTap_">
36 $i18n{changeProxySettings} 38 $i18n{changeProxySettings}
37 </controlled-button> 39 </controlled-button>
38 </div> 40 </div>
39 <template is="dom-if" if="[[prefs.proxy.extensionId]]"> 41 <template is="dom-if" if="[[prefs.proxy.extensionId]]">
40 <div class="settings-box continuation"> 42 <div class="settings-box continuation">
41 <extension-controlled-indicator class="start" 43 <extension-controlled-indicator class="start"
42 extension-id="[[prefs.proxy.extensionId]]" 44 extension-id="[[prefs.proxy.extensionId]]"
43 extension-name="[[prefs.proxy.controlledByName]]" 45 extension-name="[[prefs.proxy.controlledByName]]"
44 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]" 46 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"
45 on-extension-disable="onExtensionDisable_"> 47 on-extension-disable="onExtensionDisable_">
46 </extension-controlled-indicator> 48 </extension-controlled-indicator>
47 </div> 49 </div>
48 </template> 50 </template>
49 </template> 51 </template>
50 <script src="/system_page/system_page.js"></script> 52 <script src="/system_page/system_page.js"></script>
51 </dom-module> 53 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698