chrome/browser/resources/settings/settings_main/settings_main.html - Issue 986843002: Scaffold for MD-Settings, inside chrome://md-settings.

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/settings_main/settings_main.html

Issue 986843002: Scaffold for MD-Settings, inside chrome://md-settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Expand scaffold and add to chrome://md-settings (point of this CL) Created 5 years, 9 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

« no previous file with comments | « chrome/browser/resources/settings/settings_main/settings_main.css ('k') | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b4686e0ae6e2750007a1e32aab1ac6f27eab4031..8dc8db695143d3ae5cfa78402d2d8e5f27b62b2c 100644

--- a/chrome/browser/resources/settings/settings_main/settings_main.html

+++ b/chrome/browser/resources/settings/settings_main/settings_main.html

@@ -2,17 +2,29 @@

+<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">

+<link rel="import" href="chrome://md-settings/dummy_page/dummy_page.html">

+<link rel="import" href="chrome://md-settings/help_pane/help_pane.html">

+<link rel="import" href="chrome://md-settings/utils/utils.html">

<polymer-element name="cr-settings-main">

- <div id="container">

- <paper-shadow>

- <core-animated-pages id="pages" selected="{{selectedPageId}}"

- valueattr="PAGE_ID" transitions="cross-fade">

- <cr-settings-a11y-page prefs="{{prefs}}"></cr-settings-a11y-page>

+ <div layout horizontal id="container">

+ <paper-shadow flex two>

+ <core-animated-pages id="pages" valueattr="PAGE_ID"

+ selected="{{selectedPageId}}" selectedIndex="{{selectedPageIndex}}"

+ excludedLocalNames="template" transitions="cross-fade">

+ <template if="{{isChromeOs()}}">

+ <cr-settings-a11y-page prefs="{{prefs}}"></cr-settings-a11y-page>

+ </template>

+ <cr-settings-dummy-page prefs="{{prefs}}"></cr-settings-dummy-page>

</core-animated-pages>

</paper-shadow>

+

+ <cr-help-pane id="help" flex

+ helpArticles="{{pages.length && pages[selectedPageIndex].helpArticles}}">

+ </cr-help-pane>

</div>

</template>