Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/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/core-animated-pages/core-ani mated-pages.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/core-transition/core-transit ion.html"> | 3 <link rel="import" href="chrome://resources/polymer/core-transition/core-transit ion.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.ht ml"> | 4 <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.ht ml"> |
| 5 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> | |
| 6 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html "> | |
| 5 <link rel="import" href="chrome://md-settings/dummy_page/dummy_page.html"> | 7 <link rel="import" href="chrome://md-settings/dummy_page/dummy_page.html"> |
| 6 | 8 |
| 7 <polymer-element name="cr-settings-main"> | 9 <polymer-element name="cr-settings-main"> |
| 8 <template> | 10 <template> |
| 9 <link rel="stylesheet" href="settings_main.css"> | 11 <link rel="stylesheet" href="settings_main.css"> |
| 10 <div id="outer"> | 12 <div id="outer"> |
| 11 <paper-shadow> | 13 <content select="core-icon-button"></content> |
| 12 <content select="core-icon-button"></content> | 14 <core-animated-pages id="pageContainer" selected="{{selectedPageId}}" |
| 13 <core-animated-pages id="pageContainer" selected="{{selectedPageId}}" | 15 valueattr="PAGE_ID" transitions="cross-fade" |
| 14 valueattr="PAGE_ID" transitions="cross-fade"> | 16 on-core-animated-pages-transition-prepare="{{pageTransitionPrepared_}} "> |
|
Jeremy Klein
2015/03/18 01:58:30
We don't need the event listener anymore, right?
michaelpg
2015/03/18 02:07:22
Done.
| |
| 15 <cr-settings-dummy-page prefs="{{prefs}}"></cr-settings-dummy-page> | 17 <cr-settings-a11y-page prefs="{{prefs}}"></cr-settings-a11y-page> |
| 16 </core-animated-pages> | 18 <cr-settings-downloads-page prefs="{{prefs}}"> |
| 17 </paper-shadow> | 19 </cr-settings-downloads-page> |
| 20 <cr-settings-dummy-page prefs="{{prefs}}"></cr-settings-dummy-page> | |
| 21 </core-animated-pages> | |
| 18 </div> | 22 </div> |
| 19 </template> | 23 </template> |
| 20 <script src="settings_main.js"></script> | 24 <script src="settings_main.js"></script> |
| 21 </polymer-element> | 25 </polymer-element> |
| OLD | NEW |