Chromium Code Reviews| Index: chrome/browser/resources/md_extensions/keyboard_shortcuts.html |
| diff --git a/chrome/browser/resources/md_extensions/keyboard_shortcuts.html b/chrome/browser/resources/md_extensions/keyboard_shortcuts.html |
| index f8afc54493edbfc714be4e093ad03b6a45d77ab1..0ee0f9c082cd07527e9863ccdf878b44de27d548 100644 |
| --- a/chrome/browser/resources/md_extensions/keyboard_shortcuts.html |
| +++ b/chrome/browser/resources/md_extensions/keyboard_shortcuts.html |
| @@ -1,7 +1,8 @@ |
| <link rel="import" href="chrome://resources/html/cr.html"> |
| +<link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| +<link rel="import" href="chrome://resources/html/md_select_css.html"> |
| <link rel="import" href="chrome://resources/html/polymer.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable-behavior.html"> |
| -<link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/paper-dropdown-menu.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html"> |
|
dpapad
2017/06/15 01:35:36
Is this still used?
scottchen
2017/06/15 23:50:51
Nope, removing.
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-listbox.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html"> |
| @@ -11,7 +12,7 @@ |
| <dom-module id="extensions-keyboard-shortcuts"> |
| <template> |
| - <style> |
| + <style include="md-select"> |
| [hidden] { |
| display: none !important; |
| } |
| @@ -39,7 +40,7 @@ |
| flex: 1; |
| } |
| - .command-entry paper-dropdown-menu { |
| + .command-entry .md-select-wrapper { |
| -webkit-margin-start: 40px; |
| } |
| @@ -69,22 +70,6 @@ |
| #main { |
| margin-top: 24px; |
| } |
| - |
| - #main paper-dropdown-menu { |
| - --paper-input-container: { |
| - margin-bottom: 14px; |
| - padding: 0; |
| - }; |
| - --paper-input-container-color: var(--paper-grey-400); |
| - --paper-input-container-focus-color: var(--google-blue-500); |
| - --paper-input-container-input: { |
| - font-size: 13px; |
| - }; |
| - --paper-input-container-underline-disabled: { |
| - border-bottom: 1px solid; |
| - }; |
| - } |
| - |
| </style> |
| <div id="main"> |
| <template is="dom-repeat" items="[[calculateShownItems_(items.*)]]"> |
| @@ -101,14 +86,18 @@ |
| shortcut="[[command.keybinding]]" |
| command-name="[[command.name]]"> |
| </extensions-shortcut-input> |
| - <paper-dropdown-menu |
| - disabled$="[[computeScopeDisabled_(command)]]"> |
| - <paper-listbox class="dropdown-content" |
| - selected="[[computeSelectedScope_(command)]]"> |
| - <paper-item>$i18n{shortcutScopeInChrome}</paper-item> |
| - <paper-item>$i18n{shortcutScopeGlobal}</paper-item> |
| - </paper-listbox> |
| - </paper-dropdown> |
| + <div class="md-select-wrapper"> |
| + <select class="md-select" on-change="onScopeChanged_" |
| + disabled$="[[computeScopeDisabled_(command)]]"> |
| + <template is="dom-repeat" items="[[scopes_]]" as="scope"> |
| + <option value="[[scope.value]]" selected="[[ |
|
dpapad
2017/06/15 01:35:37
FYI, I recall now that binding the "selected" attr
scottchen
2017/06/15 23:50:51
Discussed with dpapad offline, see new patch for c
|
| + isScopeEqual_(command.scope, scope.value)]]"> |
| + [[scope.label]] |
| + </option> |
| + </template> |
| + </select> |
| + <span class="md-select-underline"></span> |
| + </div> |
| </div> |
| </template> |
| </div> |