chrome/browser/resources/settings/device_page/device_page.html - Issue 1961133004: MD Settings: Add remaining buttons to keyboard subpage

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

Issue 1961133004: MD Settings: Add remaining buttons to keyboard subpage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: closure 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/device_page/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/device_page/device_page_browser_proxy.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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">	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">	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">	5 <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">	6 <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">	7 <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">	8 <link rel="import" href="chrome://md-settings/device_page/display.html">

9 <link rel="import" href="chrome://md-settings/device_page/keyboard.html">	9 <link rel="import" href="chrome://md-settings/device_page/keyboard.html">

10 <link rel="import" href="chrome://md-settings/device_page/touchpad.html">	10 <link rel="import" href="chrome://md-settings/device_page/touchpad.html">

(...skipping 23 matching lines...) Expand all Loading...
34 <div class="middle">$i18n{displayTitle}</div>	34 <div class="middle">$i18n{displayTitle}</div>

35 </div>	35 </div>

36 </neon-animatable>	36 </neon-animatable>

37 <template is="dom-if" name="touchpad">	37 <template is="dom-if" name="touchpad">

38 <settings-subpage page-title="$i18n{touchpadTitle}">	38 <settings-subpage page-title="$i18n{touchpadTitle}">

39 <settings-touchpad prefs="{{prefs}}"></settings-touchpad>	39 <settings-touchpad prefs="{{prefs}}"></settings-touchpad>

40 </settings-subpage>	40 </settings-subpage>

41 </template>	41 </template>

42 <template is="dom-if" name="keyboard">	42 <template is="dom-if" name="keyboard">

43 <settings-subpage page-title="$i18n{keyboardTitle}">	43 <settings-subpage page-title="$i18n{keyboardTitle}">

44 <settings-keyboard prefs="{{prefs}}"></settings-keyboard>	44 <settings-keyboard prefs="{{prefs}}" current-route="{{currentRoute}}">

	45 </settings-keyboard>

45 </settings-subpage>	46 </settings-subpage>

46 </template>	47 </template>

47 <template is="dom-if" name="display">	48 <template is="dom-if" name="display">

48 <settings-subpage page-title="$i18n{displayTitle}">	49 <settings-subpage page-title="$i18n{displayTitle}">

49 <settings-display></settings-display>	50 <settings-display></settings-display>

50 </settings-subpage>	51 </settings-subpage>

51 </template>	52 </template>

52 </settings-animated-pages>	53 </settings-animated-pages>

53 </template>	54 </template>

54 <script src="device_page.js"></script>	55 <script src="device_page.js"></script>

55 </dom-module>	56 </dom-module>

OLD	NEW