Chromium Code Reviews| Index: chrome/browser/resources/settings/settings_main/settings_main.html |
| diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html |
| index 85eee63481502718bacd83bc299165aae2a92112..ba68d1c80437c258312f4864e517eea61bc68448 100644 |
| --- a/chrome/browser/resources/settings/settings_main/settings_main.html |
| +++ b/chrome/browser/resources/settings/settings_main/settings_main.html |
| @@ -2,19 +2,23 @@ |
| <link rel="import" href="chrome://resources/polymer/core-animated-pages/core-animated-pages.html"> |
| <link rel="import" href="chrome://resources/polymer/core-transition/core-transition.html"> |
| <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.html"> |
| +<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> |
| +<link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html"> |
| <link rel="import" href="chrome://md-settings/dummy_page/dummy_page.html"> |
| <polymer-element name="cr-settings-main"> |
| <template> |
| <link rel="stylesheet" href="settings_main.css"> |
| <div id="outer"> |
| - <paper-shadow> |
| - <content select="core-icon-button"></content> |
| - <core-animated-pages id="pageContainer" selected="{{selectedPageId}}" |
| - valueattr="PAGE_ID" transitions="cross-fade"> |
| - <cr-settings-dummy-page prefs="{{prefs}}"></cr-settings-dummy-page> |
| - </core-animated-pages> |
| - </paper-shadow> |
| + <content select="core-icon-button"></content> |
| + <core-animated-pages id="pageContainer" selected="{{selectedPageId}}" |
| + valueattr="PAGE_ID" transitions="cross-fade" |
| + 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.
|
| + <cr-settings-a11y-page prefs="{{prefs}}"></cr-settings-a11y-page> |
| + <cr-settings-downloads-page prefs="{{prefs}}"> |
| + </cr-settings-downloads-page> |
| + <cr-settings-dummy-page prefs="{{prefs}}"></cr-settings-dummy-page> |
| + </core-animated-pages> |
| </div> |
| </template> |
| <script src="settings_main.js"></script> |