Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/core-animated-pages/core-ani mated-pages.html"> | 2 <link rel="import" href="chrome://resources/polymer/v0_8/iron-pages/iron-pages.h tml"> |
| 3 <link rel="import" href="chrome://resources/polymer/core-transition/core-transit ion.html"> | 3 <link rel="import" href="chrome://md-settings/routes.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.ht ml"> | 4 |
| 5 <!-- TODO: Uncomment pages as they are upgraded. | |
| 5 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> | 6 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> |
| 6 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html "> | 7 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html "> |
| 7 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html "> | 8 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html "> |
| 8 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> | 9 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> |
| 9 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_page .html"> | 10 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_page .html"> |
| 10 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html"> | 11 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html"> |
| 11 <link rel="import" href="chrome://md-settings/search_page/search_page.html"> | 12 <link rel="import" href="chrome://md-settings/search_page/search_page.html"> |
| 12 <link rel="import" href="chrome://md-settings/routes.html"> | 13 --> |
| 13 <link rel="import" href="settings_main_style.html"> | |
| 14 | 14 |
| 15 <polymer-element name="cr-settings-main"> | 15 <dom-module id="cr-settings-main"> |
| 16 <link rel="import" type="css" href="settings_main.css"> | |
| 16 <template> | 17 <template> |
| 17 <core-style ref="settingsMainStyle"></core-style> | |
| 18 <div id="mainContainer"> | 18 <div id="mainContainer"> |
| 19 <cr-settings-page-header selectedPage="{{$.pageContainer.selectedItem}}"> | 19 <cr-settings-page-header selectedPage="[[selectedPage]]"> |
|
Jeremy Klein
2015/05/12 18:18:39
selected-page?
michaelpg
2015/05/12 18:42:49
Done.
| |
| 20 </cr-settings-page-header> | 20 </cr-settings-page-header> |
| 21 <content select="core-icon-button"></content> | 21 <content select="paper-icon-button"></content> |
| 22 <more-route-selector selectedParams="{{params}}"> | 22 <more-route-selector selectedParams="{{params}}"> |
| 23 <core-animated-pages id="pageContainer" | 23 <iron-pages id="pageContainer" selectedItem="{{selectedPage}}" |
|
Jeremy Klein
2015/05/12 18:18:39
should this be selected-item now?
michaelpg
2015/05/12 18:42:49
Done.
| |
| 24 on-core-select="{{onCoreSelect_}}" valueattr="PAGE_ID" | 24 on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID"> |
| 25 transitions="cross-fade"> | 25 <!-- TODO: Uncomment pages as they are upgraded. --> |
| 26 <if expr="chromeos"> | 26 <if expr="chromeos"> |
| 27 <!-- | |
| 27 <cr-settings-internet-page route="internet"> | 28 <cr-settings-internet-page route="internet"> |
| 28 </cr-settings-internet-page> | 29 </cr-settings-internet-page> |
| 30 --> | |
| 31 <!-- | |
| 29 <cr-settings-internet-detail-page route="internet-detail" | 32 <cr-settings-internet-detail-page route="internet-detail" |
| 30 subpage="true" guid="{{params.guid}}"> | 33 subpage="true" guid="{{params.guid}}"> |
| 31 </cr-settings-internet-detail-page> | 34 </cr-settings-internet-detail-page> |
| 35 --> | |
| 32 </if> | 36 </if> |
| 37 <!-- | |
| 33 <cr-settings-a11y-page prefs="{{prefs}}" route="a11y"> | 38 <cr-settings-a11y-page prefs="{{prefs}}" route="a11y"> |
| 34 </cr-settings-a11y-page> | 39 </cr-settings-a11y-page> |
| 40 --> | |
| 35 <if expr="chromeos"> | 41 <if expr="chromeos"> |
| 42 <!-- | |
| 36 <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime"> | 43 <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime"> |
| 37 </cr-settings-date-time-page> | 44 </cr-settings-date-time-page> |
| 38 </if> | 45 </if> |
| 46 --> | |
| 47 <!-- | |
| 39 <cr-settings-downloads-page prefs="{{prefs}}" route="downloads"> | 48 <cr-settings-downloads-page prefs="{{prefs}}" route="downloads"> |
| 40 </cr-settings-downloads-page> | 49 </cr-settings-downloads-page> |
| 50 --> | |
| 51 <!-- | |
| 41 <cr-settings-search-page prefs="{{prefs}}" route="search"> | 52 <cr-settings-search-page prefs="{{prefs}}" route="search"> |
| 42 </cr-settings-search-page> | 53 </cr-settings-search-page> |
| 54 --> | |
| 55 <!-- | |
| 43 <cr-settings-search-engines-page prefs="{{prefs}}" | 56 <cr-settings-search-engines-page prefs="{{prefs}}" |
| 44 route="search-engines"> | 57 route="search-engines"> |
| 45 </cr-settings-search-engines-page> | 58 </cr-settings-search-engines-page> |
| 46 </core-animated-pages> | 59 --> |
| 60 </iron-pages> | |
| 47 </more-route-selector> | 61 </more-route-selector> |
| 48 </div> | 62 </div> |
| 49 </template> | 63 </template> |
| 50 <script src="settings_main.js"></script> | 64 <script src="settings_main.js"></script> |
| 51 </polymer-element> | 65 </polymer-element> |
| OLD | NEW |