chrome/browser/resources/settings/settings_main/settings_main.html - Issue 990473002: Add initial implementation of date-time-settings MD settings page.

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 990473002: Add initial implementation of date-time-settings MD settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address nits Created 5 years, 8 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/prefs/prefs.js ('k') | chrome/browser/resources/settings/settings_page/settings_page_header.html » ('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 94313eaf1d70de7fb1fb1b425ba9707e7c45b0ac..cc96389db468e959511aa86f6c9631adb81aee72 100644

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

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

@@ -3,6 +3,7 @@

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

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

@@ -13,6 +14,10 @@

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

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

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

+<if expr="chromeos">

+ <cr-settings-date-time-page prefs="{{prefs}}">

+ </cr-settings-date-time-page>

+</if>

<cr-settings-downloads-page prefs="{{prefs}}">

</cr-settings-downloads-page>

</core-animated-pages>