Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

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

Issue 2683613003: MD Settings: Fix timezone autodetect policy indicator. (Closed)
Patch Set: Use getter instead of private state. Created 3 years, 10 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 | « no previous file | chrome/test/data/webui/settings/date_time_page_tests.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/cr.html"> 1 <link rel="import" href="chrome://resources/html/cr.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
6 <link rel="import" href="../controls/settings_dropdown_menu.html"> 7 <link rel="import" href="../controls/settings_dropdown_menu.html">
7 <link rel="import" href="../controls/settings_toggle_button.html"> 8 <link rel="import" href="../controls/settings_toggle_button.html">
8 <link rel="import" href="../i18n_setup.html"> 9 <link rel="import" href="../i18n_setup.html">
9 <link rel="import" href="../prefs/prefs_behavior.html"> 10 <link rel="import" href="../prefs/prefs_behavior.html">
10 <link rel="import" href="../prefs/prefs_types.html"> 11 <link rel="import" href="../prefs/prefs_types.html">
11 <link rel="import" href="../settings_shared_css.html"> 12 <link rel="import" href="../settings_shared_css.html">
12 13
13 <dom-module id="settings-date-time-page"> 14 <dom-module id="settings-date-time-page">
14 <template> 15 <template>
15 <style include="settings-shared"> 16 <style include="settings-shared">
16 settings-dropdown-menu { 17 settings-dropdown-menu {
17 --md-select-width: 400px; 18 --md-select-width: 400px;
18 } 19 }
19 20
21 paper-toggle-button,
20 cr-policy-pref-indicator { 22 cr-policy-pref-indicator {
21 -webkit-margin-start: var(--checkbox-spacing); 23 -webkit-margin-start: var(--checkbox-spacing);
22 } 24 }
23 </style> 25 </style>
24 <div class="settings-box first"> 26 <div class="settings-box first">
25 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" 27 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}"
26 menu-options="[[timeZoneList_]]" 28 menu-options="[[timeZoneList_]]"
27 disabled="[[timeZoneAutoDetect_]]"> 29 disabled="[[timeZoneAutoDetect_]]">
28 </settings-dropdown-menu> 30 </settings-dropdown-menu>
29 </div> 31 </div>
30 <div class="settings-box continuation"> 32 <div class="settings-box continuation">
31 <div class="start">$i18n{timeZoneGeolocation}</div> 33 <div class="start">$i18n{timeZoneGeolocation}</div>
32 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]"> 34 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp>
33 <cr-policy-pref-indicator pref="[[timeZonePolicyPref_]]"> 35 <cr-policy-pref-indicator pref="[[fakeTimeZonePolicyPref_]]">
34 </cr-policy-pref-indicator> 36 </cr-policy-pref-indicator>
35 </template> 37 </template>
36 <paper-toggle-button 38 <paper-toggle-button
37 id="timeZoneAutoDetect" 39 id="timeZoneAutoDetect"
38 checked="[[timeZoneAutoDetect_]]" 40 checked="[[timeZoneAutoDetect_]]"
39 disabled="[[hasTimeZoneAutoDetectPolicy_]]" 41 disabled="[[hasTimeZoneAutoDetectPolicy_]]"
40 on-change="onTimeZoneAutoDetectChange_"> 42 on-change="onTimeZoneAutoDetectChange_">
41 </paper-toggle-button> 43 </paper-toggle-button>
42 </div> 44 </div>
43 <div class="settings-box continuation"> 45 <div class="settings-box continuation">
44 <settings-toggle-button class="start" 46 <settings-toggle-button class="start"
45 pref="{{prefs.settings.clock.use_24hour_clock}}" 47 pref="{{prefs.settings.clock.use_24hour_clock}}"
46 label="$i18n{use24HourClock}"> 48 label="$i18n{use24HourClock}">
47 </settings-toggle-button> 49 </settings-toggle-button>
48 </div> 50 </div>
49 <div class="settings-box" id="setDateTime" actionable 51 <div class="settings-box" id="setDateTime" actionable
50 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> 52 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]">
51 <div class="start"> 53 <div class="start">
52 <div>$i18n{setDateTime}</div> 54 <div>$i18n{setDateTime}</div>
53 </div> 55 </div>
54 <button class="subpage-arrow" is="paper-icon-button-light"></button> 56 <button class="subpage-arrow" is="paper-icon-button-light"></button>
55 </div> 57 </div>
56 </template> 58 </template>
57 <script src="date_time_page.js"></script> 59 <script src="date_time_page.js"></script>
58 </dom-module> 60 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/webui/settings/date_time_page_tests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698