chrome/browser/resources/settings/device_page/keyboard.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)

Patch Set: resolve more conflicts Created 3 years, 10 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/drive_cache_dialog.html ('k') | chrome/browser/resources/settings/device_page/pointers.html » ('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/cr_elements/cr_slider/cr_slider.html ">	1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html ">

2 <link rel="import" href="chrome://resources/html/cr.html">	2 <link rel="import" href="chrome://resources/html/cr.html">

3 <link rel="import" href="chrome://resources/html/polymer.html">	3 <link rel="import" href="chrome://resources/html/polymer.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">

6 <link rel="import" href="/controls/settings_dropdown_menu.html">	6 <link rel="import" href="../controls/settings_dropdown_menu.html">

7 <link rel="import" href="/controls/settings_toggle_button.html">	7 <link rel="import" href="../controls/settings_toggle_button.html">

8 <link rel="import" href="/i18n_setup.html">	8 <link rel="import" href="../i18n_setup.html">

9 <link rel="import" href="/route.html">	9 <link rel="import" href="../route.html">

10 <link rel="import" href="/settings_shared_css.html">	10 <link rel="import" href="../settings_shared_css.html">

11	11

12 <dom-module id="settings-keyboard">	12 <dom-module id="settings-keyboard">

13 <template>	13 <template>

14 <style include="settings-shared"></style>	14 <style include="settings-shared"></style>

15 <div class="settings-box first">	15 <div class="settings-box first">

16 <div class="start">$i18n{keyboardKeySearch}</div>	16 <div class="start">$i18n{keyboardKeySearch}</div>

17 <settings-dropdown-menu	17 <settings-dropdown-menu

18 pref="{{prefs.settings.language.xkb_remap_search_key_to}}"	18 pref="{{prefs.settings.language.xkb_remap_search_key_to}}"

19 menu-options="[[keyMapTargets_]]">	19 menu-options="[[keyMapTargets_]]">

20 </settings-dropdown-menu>	20 </settings-dropdown-menu>

(...skipping 90 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 <div class="start">$i18n{showKeyboardShortcutsOverlay}</div>	111 <div class="start">$i18n{showKeyboardShortcutsOverlay}</div>

112 <button class="icon-external" is="paper-icon-button-light"></button>	112 <button class="icon-external" is="paper-icon-button-light"></button>

113 </div>	113 </div>

114 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable>	114 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable>

115 <div class="start">$i18n{keyboardShowLanguageAndInput}</div>	115 <div class="start">$i18n{keyboardShowLanguageAndInput}</div>

116 <button class="subpage-arrow" is="paper-icon-button-light"></button>	116 <button class="subpage-arrow" is="paper-icon-button-light"></button>

117 </div>	117 </div>

118 </template>	118 </template>

119 <script src="keyboard.js"></script>	119 <script src="keyboard.js"></script>

120 </dom-module>	120 </dom-module>

OLD	NEW