chrome/browser/resources/settings/basic_page/basic_page.html - Issue 1241363002: Settings Rewrite: Make a common settings-section component.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« chrome/browser/resources/settings/a11y_page/a11y_page.html ('K') | « chrome/browser/resources/settings/appearance_page/appearance_page.html ('k') | chrome/browser/resources/settings/date_time_page/date_time_page.html » ('j') | chrome/browser/resources/settings/internet_page/internet_detail_page.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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://md-settings/internet_page/internet_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">

+</if>

<dom-module id="cr-settings-basic-page">

- <link rel="import" type="css"

- href="chrome://md-settings/settings_page/settings_page.css">

- <cr-settings-internet-page route="internet">

- </cr-settings-internet-page>

+ <cr-settings-section route="internet">

+ <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>

</dom-module>