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

Unified 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, 3 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 side-by-side diff with in-line comments
Download patch
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 a207d51c364f87017d73f59ee82c2c0740b296a3..d90d3519d58d783753afc2f6171c26a6eb957597 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.html
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -6,20 +6,18 @@
<dom-module id="cr-settings-main">
<link rel="import" type="css" href="settings_main.css">
<template>
- <div id="mainContainer">
- <content select="paper-icon-button"></content>
- <iron-pages id="pageContainer" attr-for-selected="data-route-page"
- selected="[[getSelectedPage_(currentRoute)]]">
- <cr-settings-basic-page data-route-page="basic" prefs="{{prefs}}"
- expand-container="{{expandContainer}}"
- current-route="{{currentRoute}}">
- </cr-settings-basic-page>
- <cr-settings-advanced-page data-route-page="advanced" prefs="{{prefs}}"
- expand-container="{{expandContainer}}"
- current-route="{{currentRoute}}">
- </cr-settings-advanced-page>
- </iron-pages>
- </div>
+ <content select="paper-icon-button"></content>
+ <iron-pages id="pageContainer" attr-for-selected="data-route-page"
+ selected="[[getSelectedPage_(currentRoute)]]">
+ <cr-settings-basic-page data-route-page="basic" prefs="{{prefs}}"
+ expand-container="[[expandContainer]]"
+ current-route="{{currentRoute}}">
+ </cr-settings-basic-page>
+ <cr-settings-advanced-page data-route-page="advanced" prefs="{{prefs}}"
+ expand-container="[[expandContainer]]"
+ current-route="{{currentRoute}}">
+ </cr-settings-advanced-page>
+ </iron-pages>
</template>
<script src="settings_main.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698