Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(783)

Side by Side Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 1358313004: Settings Rewrite: Make subpage scrolling work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">
3 <link rel="import" href="chrome://md-settings/advanced_page/advanced_page.html"> 3 <link rel="import" href="chrome://md-settings/advanced_page/advanced_page.html">
4 <link rel="import" href="chrome://md-settings/basic_page/basic_page.html"> 4 <link rel="import" href="chrome://md-settings/basic_page/basic_page.html">
5 5
6 <dom-module id="cr-settings-main"> 6 <dom-module id="cr-settings-main">
7 <link rel="import" type="css" href="settings_main.css"> 7 <link rel="import" type="css" href="settings_main.css">
8 <template> 8 <template>
9 <div id="mainContainer"> 9 <content select="paper-icon-button"></content>
10 <content select="paper-icon-button"></content> 10 <iron-pages id="pageContainer" attr-for-selected="data-route-page"
11 <iron-pages id="pageContainer" attr-for-selected="data-route-page" 11 selected="[[getSelectedPage_(currentRoute)]]">
12 selected="[[getSelectedPage_(currentRoute)]]"> 12 <cr-settings-basic-page data-route-page="basic" prefs="{{prefs}}"
13 <cr-settings-basic-page data-route-page="basic" prefs="{{prefs}}" 13 expand-container="[[expandContainer]]"
14 expand-container="{{expandContainer}}" 14 current-route="{{currentRoute}}">
15 current-route="{{currentRoute}}"> 15 </cr-settings-basic-page>
16 </cr-settings-basic-page> 16 <cr-settings-advanced-page data-route-page="advanced" prefs="{{prefs}}"
17 <cr-settings-advanced-page data-route-page="advanced" prefs="{{prefs}}" 17 expand-container="[[expandContainer]]"
18 expand-container="{{expandContainer}}" 18 current-route="{{currentRoute}}">
19 current-route="{{currentRoute}}"> 19 </cr-settings-advanced-page>
20 </cr-settings-advanced-page> 20 </iron-pages>
21 </iron-pages>
22 </div>
23 </template> 21 </template>
24 <script src="settings_main.js"></script> 22 <script src="settings_main.js"></script>
25 </dom-module> 23 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698