| 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/iron-flex-layout/iron-f
lex-layout-classes.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> |
| 6 <link rel="import" href="/controls/settings_checkbox.html"> | 6 <link rel="import" href="/controls/settings_checkbox.html"> |
| 7 <link rel="import" href="/controls/settings_dropdown_menu.html"> | 7 <link rel="import" href="/controls/settings_dropdown_menu.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="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| 10 | 11 |
| 11 <dom-module id="settings-keyboard"> | 12 <dom-module id="settings-keyboard"> |
| 12 <template> | 13 <template> |
| 13 <style include="settings-shared"></style> | 14 <style include="settings-shared"></style> |
| 14 <div class="settings-box first"> | 15 <div class="settings-box first"> |
| 15 <div class="start">$i18n{keyboardKeySearch}</div> | 16 <div class="start">$i18n{keyboardKeySearch}</div> |
| 16 <settings-dropdown-menu | 17 <settings-dropdown-menu |
| 17 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" | 18 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" |
| 18 menu-options="[[keyMapTargetsWithCapsLock_]]"> | 19 menu-options="[[keyMapTargetsWithCapsLock_]]"> |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 <div id="keyboardOverlay" class="settings-box" | 96 <div id="keyboardOverlay" class="settings-box" |
| 96 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable> | 97 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable> |
| 97 $i18n{showKeyboardShortcutsOverlay} | 98 $i18n{showKeyboardShortcutsOverlay} |
| 98 </div> | 99 </div> |
| 99 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable> | 100 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable> |
| 100 $i18n{keyboardShowLanguageAndInput} | 101 $i18n{keyboardShowLanguageAndInput} |
| 101 </div> | 102 </div> |
| 102 </template> | 103 </template> |
| 103 <script src="keyboard.js"></script> | 104 <script src="keyboard.js"></script> |
| 104 </dom-module> | 105 </dom-module> |
| OLD | NEW |