| OLD | NEW |
| 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/cr_elements/policy/cr_policy_pref_in
dicator.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 10 matching lines...) Expand all Loading... |
| 21 settings-dropdown-menu { | 21 settings-dropdown-menu { |
| 22 --md-select-width: 400px; | 22 --md-select-width: 400px; |
| 23 } | 23 } |
| 24 | 24 |
| 25 paper-toggle-button, | 25 paper-toggle-button, |
| 26 cr-policy-pref-indicator { | 26 cr-policy-pref-indicator { |
| 27 -webkit-margin-start: var(--checkbox-spacing); | 27 -webkit-margin-start: var(--checkbox-spacing); |
| 28 } | 28 } |
| 29 </style> | 29 </style> |
| 30 <div class="settings-box first"> | 30 <div class="settings-box first"> |
| 31 <div class="start">$i18n{timeZoneGeolocation}</div> | 31 <div id="timezoneGeolocateToggleLabel" class="start"> |
| 32 $i18n{timeZoneGeolocation} |
| 33 </div> |
| 32 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp> | 34 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp> |
| 33 <cr-policy-pref-indicator pref="[[fakeTimeZonePolicyPref_]]"> | 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" |
| 40 aria-labelledby="timezoneGeolocateToggleLabel" |
| 38 checked="[[timeZoneAutoDetect_]]" | 41 checked="[[timeZoneAutoDetect_]]" |
| 39 disabled="[[hasTimeZoneAutoDetectPolicy_]]" | 42 disabled="[[hasTimeZoneAutoDetectPolicy_]]" |
| 40 on-change="onTimeZoneAutoDetectChange_"> | 43 on-change="onTimeZoneAutoDetectChange_"> |
| 41 </paper-toggle-button> | 44 </paper-toggle-button> |
| 42 </div> | 45 </div> |
| 43 <div class="settings-box continuation embedded"> | 46 <div class="settings-box continuation embedded"> |
| 44 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" | 47 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" |
| 45 menu-options="[[timeZoneList_]]" | 48 menu-options="[[timeZoneList_]]" |
| 46 disabled="[[timeZoneAutoDetect_]]"> | 49 disabled="[[timeZoneAutoDetect_]]"> |
| 47 </settings-dropdown-menu> | 50 </settings-dropdown-menu> |
| 48 </div> | 51 </div> |
| 49 <div class="settings-box"> | 52 <div class="settings-box"> |
| 50 <settings-toggle-button class="start" | 53 <settings-toggle-button class="start" |
| 51 pref="{{prefs.settings.clock.use_24hour_clock}}" | 54 pref="{{prefs.settings.clock.use_24hour_clock}}" |
| 52 label="$i18n{use24HourClock}"> | 55 label="$i18n{use24HourClock}"> |
| 53 </settings-toggle-button> | 56 </settings-toggle-button> |
| 54 </div> | 57 </div> |
| 55 <div class="settings-box" id="setDateTime" actionable | 58 <div class="settings-box" id="setDateTime" actionable |
| 56 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> | 59 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> |
| 57 <div class="start">$i18n{setDateTime}</div> | 60 <div class="start">$i18n{setDateTime}</div> |
| 58 <button class="subpage-arrow" is="paper-icon-button-light" | 61 <button class="subpage-arrow" is="paper-icon-button-light" |
| 59 aria-label="$i18n{setDateTime}"></button> | 62 aria-label="$i18n{setDateTime}"></button> |
| 60 </div> | 63 </div> |
| 61 </template> | 64 </template> |
| 62 <script src="date_time_page.js"></script> | 65 <script src="date_time_page.js"></script> |
| 63 </dom-module> | 66 </dom-module> |
| OLD | NEW |