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

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

Issue 2849823003: ChromeOS: implement per-user time zone preferences. (Closed)
Patch Set: Try remove g_browser_process check Created 3 years, 7 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
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_indicat or.html"> 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or.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-icon-button/paper -icon-button-light.html">
6 <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">
7 <link rel="import" href="../controls/settings_dropdown_menu.html"> 7 <link rel="import" href="../controls/settings_dropdown_menu.html">
8 <link rel="import" href="../controls/settings_toggle_button.html"> 8 <link rel="import" href="../controls/settings_toggle_button.html">
9 <link rel="import" href="../i18n_setup.html"> 9 <link rel="import" href="../i18n_setup.html">
10 <link rel="import" href="../prefs/prefs_behavior.html"> 10 <link rel="import" href="../prefs/prefs_behavior.html">
(...skipping 13 matching lines...) Expand all
24 24
25 paper-toggle-button, 25 paper-toggle-button,
26 cr-policy-indicator { 26 cr-policy-indicator {
27 -webkit-margin-start: var(--settings-control-spacing); 27 -webkit-margin-start: var(--settings-control-spacing);
28 } 28 }
29 </style> 29 </style>
30 <div class="settings-box first"> 30 <div class="settings-box first">
31 <div id="timezoneGeolocateToggleLabel" class="start"> 31 <div id="timezoneGeolocateToggleLabel" class="start">
32 $i18n{timeZoneGeolocation} 32 $i18n{timeZoneGeolocation}
33 </div> 33 </div>
34 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp> 34 <settings-toggle-button
35 <cr-policy-indicator indicator-type="devicePolicy" 35 pref="{{prefs.settings.resolve_timezone_by_geolocation}}"
36 icon-aria-label="$i18n{timeZoneGeolocation}">
37 </cr-policy-indicator>
38 </template>
39 <paper-toggle-button
40 id="timeZoneAutoDetect" 36 id="timeZoneAutoDetect"
41 aria-labelledby="timezoneGeolocateToggleLabel" 37 aria-labelledby="timezoneGeolocateToggleLabel">
42 checked="[[timeZoneAutoDetect_]]" 38 </settings-toggle-button>
43 disabled="[[hasTimeZoneAutoDetectPolicy_]]"
44 on-change="onTimeZoneAutoDetectChange_">
45 </paper-toggle-button>
46 </div> 39 </div>
47 <div class="settings-box continuation embedded"> 40 <div class="settings-box continuation embedded">
48 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" 41 <settings-dropdown-menu id="userTimeZoneSelector"
42 pref="{{prefs.settings.timezone}}"
49 label="$i18n{timeZone}" 43 label="$i18n{timeZone}"
50 menu-options="[[timeZoneList_]]" 44 menu-options="[[timeZoneList_]]"
51 disabled="[[timeZoneAutoDetect_]]"> 45 hidden="[[isUserTimeZoneSelectorHidden_(prefs.settings.timezone,
46 prefs.settings.resolve_timezone_by_geolocation.value)]]">
47 </settings-dropdown-menu>
48 <settings-dropdown-menu id="systemTimezoneSelector"
49 pref="{{prefs.cros.system.timezone}}"
50 label="$i18n{timeZone}"
51 menu-options="[[timeZoneList_]]"
52 disabled
53 hidden="[[!isUserTimeZoneSelectorHidden_(prefs.settings.timezone,
54 prefs.settings.resolve_timezone_by_geolocation.value)]]">
52 </settings-dropdown-menu> 55 </settings-dropdown-menu>
stevenjb 2017/05/16 17:16:57 Good point. You could create a fake pref and map t
Alexander Alekseev 2017/05/19 11:25:29 Done.
53 </div> 56 </div>
54 <div class="settings-box"> 57 <div class="settings-box">
55 <settings-toggle-button class="start" 58 <settings-toggle-button class="start"
56 pref="{{prefs.settings.clock.use_24hour_clock}}" 59 pref="{{prefs.settings.clock.use_24hour_clock}}"
57 label="$i18n{use24HourClock}"> 60 label="$i18n{use24HourClock}">
58 </settings-toggle-button> 61 </settings-toggle-button>
59 </div> 62 </div>
60 <div class="settings-box" id="setDateTime" actionable 63 <div class="settings-box" id="setDateTime" actionable
61 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> 64 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]">
62 <div class="start">$i18n{setDateTime}</div> 65 <div class="start">$i18n{setDateTime}</div>
63 <button class="subpage-arrow" is="paper-icon-button-light" 66 <button class="subpage-arrow" is="paper-icon-button-light"
64 aria-label="$i18n{setDateTime}"></button> 67 aria-label="$i18n{setDateTime}"></button>
65 </div> 68 </div>
66 </template> 69 </template>
67 <script src="date_time_page.js"></script> 70 <script src="date_time_page.js"></script>
68 </dom-module> 71 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698