ChromeOS: implement per-user time zone preferences.

chrome/browser/resources/settings/date_time_page/date_time_page.html

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 b40d20261b9f4aa10d5b2a4b0cf4f72957b32630..1864e71ecd4d081ba0be275c3ce58c1c2247c763 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
@@ -35,25 +35,61 @@
       <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 is="dom-if" restamp
+          if="[[!prefs.cros.flags.per_user_timezone_enabled.value]]">
+        <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
+            id="timeZoneAutoDetect"
+            aria-labelledby="timezoneGeolocateToggleLabel"
+            checked="[[timeZoneAutoDetect_]]"
+            disabled="[[hasTimeZoneAutoDetectPolicy_]]"
+            on-change="onTimeZoneAutoDetectChange_">
+        </paper-toggle-button>
       </template>
-      <paper-toggle-button
+      <template is="dom-if" restamp
+          if="[[prefs.cros.flags.per_user_timezone_enabled.value]]">
+      <settings-toggle-button

[stevenjb, 2017/05/25 22:13:06]

indent

[Alexander Alekseev, 2017/05/29 21:10:23]

Done.

+          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>
+      </template>
     </div>
     <div class="settings-box continuation embedded">
-      <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}"
-          label="$i18n{timeZone}"
-          menu-options="[[timeZoneList_]]"
-          disabled="[[timeZoneAutoDetect_]]">
-      </settings-dropdown-menu>
+      <template is="dom-if" restamp
+          if="[[!prefs.cros.flags.per_user_timezone_enabled.value]]">
+        <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}"
+            label="$i18n{timeZone}"
+            menu-options="[[timeZoneList_]]"
+            disabled="[[timeZoneAutoDetect_]]">
+        </settings-dropdown-menu>
+      </template>
+      <template is="dom-if" restamp
+          if="[[prefs.cros.flags.per_user_timezone_enabled.value]]">
+        <template is="dom-if" if="[[!isUserTimeZoneSelectorHidden_(
+               prefs.settings.timezone,
+               prefs.settings.resolve_timezone_by_geolocation.value)]]" restamp>
+          <settings-dropdown-menu id="userTimeZoneSelector"
+              pref="{{prefs.settings.timezone}}"
+              label="$i18n{timeZone}"
+              menu-options="[[timeZoneList_]]">
+          </settings-dropdown-menu>
+        </template>
+        <template is="dom-if" if="[[isUserTimeZoneSelectorHidden_(
+               prefs.settings.timezone,
+               prefs.settings.resolve_timezone_by_geolocation.value)]]" restamp>
+          <settings-dropdown-menu id="systemTimezoneSelector"
+              pref="{{prefs.cros.system.timezone}}"
+              label="$i18n{timeZone}"
+              menu-options="[[timeZoneList_]]"
+              disabled>
+          </settings-dropdown-menu>
+        </template>
+      </template>
     </div>
     <div class="settings-box">
       <settings-toggle-button class="start"