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

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: Fixing issues 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

« chrome/browser/resources/settings/a11y_page/a11y_page.html ('K') | « chrome/browser/resources/settings/prefs/prefs.js ('k') | chrome/browser/resources/settings/settings_page/settings_page_header.html » ('j') | chrome/browser/resources/settings/settings_page/settings_page_header.html » ('J')
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..6de4b30a1ff0d927115cf4f9c48608de4c44b6ed 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">

michaelpg 2015/04/07 06:00:29 <if> tags should be 0-aligned, i.e. not indented a

Oren Blasberg 2015/04/07 23:25:59 Done. BTW, why is that?

michaelpg 2015/04/10 08:01:04 It is just The Way Of Things. Interestingly, the

James Hawkins 2015/04/10 15:03:55 That portion of the style guide is ambiguous becau

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

michaelpg 2015/04/07 06:00:29 and this line should not be indented relative to t

Oren Blasberg 2015/04/07 23:25:59 Done.

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

+ </if>

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

</cr-settings-downloads-page>

</core-animated-pages>