Chromium Code Reviews| 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/16 17:16:57
Good point. You could create a fake pref and map t
Alexander Alekseev
2017/05/19 11:25:29
Done.
|
| </div> |
| <div class="settings-box"> |