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

Unified Diff: chrome/browser/resources/settings/basic_page/basic_page.html

Issue 1241363002: Settings Rewrite: Make a common settings-section component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0300-webui-settings-structure
Patch Set: Created 5 years, 5 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/basic_page/basic_page.html
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
index 3fe3df82989a61f083b76465de8c4d04d2fbe32b..c46198e625f9617a21b400f0549840439daf376d 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -1,22 +1,34 @@
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
<link rel="import" href="chrome://md-settings/appearance_page/appearance_page.html">
-<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
<link rel="import" href="chrome://md-settings/search_page/search_page.html">
+<link rel="import" href="chrome://md-settings/settings_page/settings_section.html">
+
+<if expr="chromeos">
+<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
<link rel="import" href="chrome://md-settings/users_page/users_page.html">
+</if>
<dom-module id="cr-settings-basic-page">
- <link rel="import" type="css"
- href="chrome://md-settings/settings_page/settings_page.css">
<template>
<if expr="chromeos">
- <cr-settings-internet-page route="internet">
- </cr-settings-internet-page>
+ <cr-settings-section route="internet">
Dan Beam 2015/07/22 23:12:17 why is the route here?
tommycli 2015/07/22 23:54:38 Per our discussion, I think we should just keep it
+ <cr-settings-internet-page></cr-settings-internet-page>
+ </cr-settings-section>
+</if>
+ <cr-settings-section route="appearance">
+ <cr-settings-appearance-page prefs="{{prefs}}">
+ </cr-settings-appearance-page>
+ </cr-settings-section>
+
+ <cr-settings-section route="search">
+ <cr-settings-search-page></cr-settings-search-page>
+ </cr-settings-section>
+
+<if expr="chromeos">
+ <cr-settings-section route="users">
+ <cr-settings-users-page prefs="{{prefs}}"></cr-settings-users-page>
+ </cr-settings-section>
</if>
- <cr-settings-appearance-page prefs="{{prefs}}" route="appearance">
- </cr-settings-appearance-page>
- <cr-settings-search-page route="search"></cr-settings-search-page>
- <cr-settings-users-page prefs="{{prefs}}" route="users">
- </cr-settings-users-page>
</template>
<script src="basic_page.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698