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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1959163002: MD Settings: use custom iconset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SettingsIcons
Patch Set: Created 4 years, 7 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/default_browser_page/default_browser_page.html ('k') | chrome/browser/resources/settings/icons.html » ('j') | chrome/browser/resources/settings/icons.html » ('J')
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-icon/iron-icon.htm l"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-ico ns.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml"> 4 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml">
7 <link rel="import" href="chrome://md-settings/device_page/device_page_browser_pr oxy.html"> 5 <link rel="import" href="chrome://md-settings/device_page/device_page_browser_pr oxy.html">
8 <link rel="import" href="chrome://md-settings/device_page/display.html"> 6 <link rel="import" href="chrome://md-settings/device_page/display.html">
9 <link rel="import" href="chrome://md-settings/device_page/keyboard.html"> 7 <link rel="import" href="chrome://md-settings/device_page/keyboard.html">
10 <link rel="import" href="chrome://md-settings/device_page/touchpad.html"> 8 <link rel="import" href="chrome://md-settings/device_page/touchpad.html">
9 <link rel="import" href="chrome://md-settings/icons.html">
11 <link rel="import" href="chrome://md-settings/prefs/prefs.html"> 10 <link rel="import" href="chrome://md-settings/prefs/prefs.html">
12 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 11 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
13 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> 12 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l">
14 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 13 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
15 14
16 <dom-module id="settings-device-page"> 15 <dom-module id="settings-device-page">
17 <template> 16 <template>
18 <style include="settings-shared"></style> 17 <style include="settings-shared"></style>
19 <settings-animated-pages id="pages" section="device" 18 <settings-animated-pages id="pages" section="device"
20 current-route="{{currentRoute}}"> 19 current-route="{{currentRoute}}">
21 <neon-animatable id="main"> 20 <neon-animatable id="main">
22 <div id="touchpadRow" class="settings-box first" 21 <div id="touchpadRow" class="settings-box first"
23 on-tap="onTouchpadTap_"> 22 on-tap="onTouchpadTap_">
24 <!-- TODO(michaelpg): Get a touchpad icon. --> 23 <!-- TODO(michaelpg): Get a touchpad icon. -->
25 <iron-icon icon="image:brightness-1"></iron-icon> 24 <iron-icon icon="settings:brightness-1"></iron-icon>
26 <div class="middle">$i18n{touchpadTitle}</div> 25 <div class="middle">$i18n{touchpadTitle}</div>
27 </div> 26 </div>
28 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"> 27 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_">
29 <iron-icon icon="hardware:keyboard"></iron-icon> 28 <iron-icon icon="settings:keyboard"></iron-icon>
30 <div class="middle">$i18n{keyboardTitle}</div> 29 <div class="middle">$i18n{keyboardTitle}</div>
31 </div> 30 </div>
32 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"> 31 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_">
33 <iron-icon icon="hardware:desktop-windows"></iron-icon> 32 <iron-icon icon="settings:desktop-windows"></iron-icon>
34 <div class="middle">$i18n{displayTitle}</div> 33 <div class="middle">$i18n{displayTitle}</div>
35 </div> 34 </div>
36 </neon-animatable> 35 </neon-animatable>
37 <template is="dom-if" name="touchpad"> 36 <template is="dom-if" name="touchpad">
38 <settings-subpage page-title="$i18n{touchpadTitle}"> 37 <settings-subpage page-title="$i18n{touchpadTitle}">
39 <settings-touchpad prefs="{{prefs}}"></settings-touchpad> 38 <settings-touchpad prefs="{{prefs}}"></settings-touchpad>
40 </settings-subpage> 39 </settings-subpage>
41 </template> 40 </template>
42 <template is="dom-if" name="keyboard"> 41 <template is="dom-if" name="keyboard">
43 <settings-subpage page-title="$i18n{keyboardTitle}"> 42 <settings-subpage page-title="$i18n{keyboardTitle}">
44 <settings-keyboard prefs="{{prefs}}"></settings-keyboard> 43 <settings-keyboard prefs="{{prefs}}"></settings-keyboard>
45 </settings-subpage> 44 </settings-subpage>
46 </template> 45 </template>
47 <template is="dom-if" name="display"> 46 <template is="dom-if" name="display">
48 <settings-subpage page-title="$i18n{displayTitle}"> 47 <settings-subpage page-title="$i18n{displayTitle}">
49 <settings-display></settings-display> 48 <settings-display></settings-display>
50 </settings-subpage> 49 </settings-subpage>
51 </template> 50 </template>
52 </settings-animated-pages> 51 </settings-animated-pages>
53 </template> 52 </template>
54 <script src="device_page.js"></script> 53 <script src="device_page.js"></script>
55 </dom-module> 54 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/default_browser_page/default_browser_page.html ('k') | chrome/browser/resources/settings/icons.html » ('j') | chrome/browser/resources/settings/icons.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698