chrome/browser/resources/settings/date_time_page/date_time_page.html - Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/resources/settings/date_time_page/date_time_page.html

Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v1

Patch Set: fix a merge mistake Created 5 years, 6 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/resources/settings/checkbox/checkbox.html ('k') | chrome/browser/resources/settings/downloads_page/downloads_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://md-settings/checkbox/checkbox.html">	1 <link rel="import" href="chrome://md-settings/checkbox/checkbox.html">

2 <link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

3 <link rel="import" href="chrome://resources/polymer/v0_8/iron-flex-layout/classe s/iron-flex-layout.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

4 <link rel="import" href="chrome://resources/polymer/v0_8/paper-material/paper-ma terial.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-ma terial.html">

5	5

6 <dom-module id="cr-settings-date-time-page">	6 <dom-module id="cr-settings-date-time-page">

7 <link rel="import" type="css" href="date_time_page.css">	7 <link rel="import" type="css" href="date_time_page.css">

8 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css">	8 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css">

9 <template>	9 <template>

10 <paper-material class="layout veritcal">	10 <paper-material class="layout veritcal">

11 <div class="horizontal layout center">	11 <div class="horizontal layout center">

12 <span class="time-zone-label" i18n-content="dateTimeTimeZoneLabel"></spa n>	12 <span class="time-zone-label" i18n-content="dateTimeTimeZoneLabel"></spa n>

13 </div>	13 </div>

14 <cr-settings-checkbox	14 <cr-settings-checkbox

15 pref="{{prefs.settings.clock.use_24hour_clock}}"	15 pref="{{prefs.settings.clock.use_24hour_clock}}"

16 i18n-values="label:dateTime24HourClockLabel">	16 i18n-values="label:dateTime24HourClockLabel">

17 </cr-settings-checkbox>	17 </cr-settings-checkbox>

18 <span id="setAutomatically" i18n-content="dateTimeAutomaticallySet"></span >	18 <span id="setAutomatically" i18n-content="dateTimeAutomaticallySet"></span >

19 </paper-material>	19 </paper-material>

20 </template>	20 </template>

21 <script src="date_time_page.js"></script>	21 <script src="date_time_page.js"></script>

22 </dom-module>	22 </dom-module>

OLD	NEW