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

Unified Diff: chrome/browser/resources/settings/date_time_page/date_time_page.html

Issue 2849823003: ChromeOS: implement per-user time zone preferences. (Closed)
Patch Set: Fixed tests. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/date_time_page/date_time_page.html
diff --git a/chrome/browser/resources/settings/date_time_page/date_time_page.html b/chrome/browser/resources/settings/date_time_page/date_time_page.html
index b221d10842f4a6f9d772e655afc43d21e3d373b1..d0e8722ad4e947523c533164271cdcbf6a28732e 100644
--- a/chrome/browser/resources/settings/date_time_page/date_time_page.html
+++ b/chrome/browser/resources/settings/date_time_page/date_time_page.html
@@ -31,24 +31,27 @@
<div id="timezoneGeolocateToggleLabel" class="start">
$i18n{timeZoneGeolocation}
</div>
- <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp>
- <cr-policy-indicator indicator-type="devicePolicy"
- icon-aria-label="$i18n{timeZoneGeolocation}">
- </cr-policy-indicator>
- </template>
- <paper-toggle-button
+ <settings-toggle-button
+ pref="{{prefs.settings.resolve_timezone_by_geolocation}}"
id="timeZoneAutoDetect"
- aria-labelledby="timezoneGeolocateToggleLabel"
- checked="[[timeZoneAutoDetect_]]"
- disabled="[[hasTimeZoneAutoDetectPolicy_]]"
- on-change="onTimeZoneAutoDetectChange_">
- </paper-toggle-button>
+ aria-labelledby="timezoneGeolocateToggleLabel">
+ </settings-toggle-button>
</div>
<div class="settings-box continuation embedded">
- <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}"
+ <settings-dropdown-menu id="userTimeZoneSelector"
+ pref="{{prefs.settings.timezone}}"
+ label="$i18n{timeZone}"
+ menu-options="[[timeZoneList_]]"
+ hidden="[[isUserTimeZoneSelectorHidden_(prefs.settings.timezone,
+ prefs.settings.resolve_timezone_by_geolocation.value)]]">
+ </settings-dropdown-menu>
+ <settings-dropdown-menu id="systemTimezoneSelector"
+ pref="{{prefs.cros.system.timezone}}"
label="$i18n{timeZone}"
menu-options="[[timeZoneList_]]"
- disabled="[[timeZoneAutoDetect_]]">
+ disabled
+ hidden="[[!isUserTimeZoneSelectorHidden_(prefs.settings.timezone,
+ prefs.settings.resolve_timezone_by_geolocation.value)]]">
</settings-dropdown-menu>
stevenjb 2017/05/15 17:08:02 Having multiple dropdowns with opposite 'hidden' v
Alexander Alekseev 2017/05/16 01:11:56 as you see, preferences are two-way bound here. I
</div>
<div class="settings-box">

Powered by Google App Engine
This is Rietveld 408576698