Chromium Code Reviews| Index: chrome/browser/resources/settings/settings_menu/settings_menu.html |
| diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html |
| index bbf3aad7a93089cc7a498e2a9b4d8204b4a90ec4..7a50e8a7f452c9b277b63760517e1dd25bca0e14 100644 |
| --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html |
| +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html |
| @@ -1,22 +1,21 @@ |
| -<link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html"> |
| -<link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html"> |
| -<link rel="import" href="settings_menu_style.html"> |
| +<link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html"> |
| +<link rel="import" href="chrome://resources/polymer/v0_8/iron-icon/iron-icon.html"> |
| +<link rel="import" href="chrome://resources/polymer/v0_8/iron-icons/iron-icons.html"> |
| +<link rel="import" href="chrome://resources/polymer/v0_8/iron-selector/iron-selector.html"> |
| +<link rel="import" href="chrome://resources/polymer/v0_8/paper-item/paper-icon-item.html"> |
| +<link rel="import" href="chrome://resources/polymer/v0_8/paper-styles/paper-styles.html"> |
|
Jeremy Klein
2015/05/12 18:27:04
Where is this used?
michaelpg
2015/05/12 19:27:08
oops, isn't
|
| -<polymer-element name="cr-settings-menu"> |
| +<dom-module id="cr-settings-menu"> |
| + <link rel="import" type="css" href="settings_menu.css"> |
| <template> |
| - <core-style ref="settingsMenuStyle"></core-style> |
| - <!-- TODO(jlklein): selectedAttribute here is a workaround for |
| - https://github.com/Polymer/polymer/issues/946. Remove when core-menu |
| - is updated. --> |
| - <core-menu selected="{{selectedId}}" valueattr="data-id" |
| - selectedAttribute=""> |
| - <template repeat="{{pages}}"> |
| - <paper-item data-id="{{PAGE_ID}}"> |
| - <core-icon icon="{{icon}}"></core-icon> |
| - {{pageTitle}} |
| + <iron-selector selected="{{selectedId}}" attr-for-selected="data-id"> |
|
Jeremy Klein
2015/05/12 18:27:04
Should this be a paper-menu when that cl lands?
michaelpg
2015/05/12 19:27:08
Yes, they just published 0.8.3 which works as expe
|
| + <template is="x-repeat" items="[[pages]]"> |
| + <paper-icon-item data-id$="[[item.PAGE_ID]]" icon-width="34px"> |
| + <iron-icon icon="[[item.icon]]" item-icon></iron-icon> |
| + <span>[[item.pageTitle]]</span> |
| </paper-item> |
| </template> |
| - </core-menu> |
| + </iron-selector> |
| </template> |
| <script src="settings_menu.js"></script> |
| -</polymer-element> |
| +</dom-module> |