Index: chrome/browser/resources/options/browser_options.js |
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js |
index c47916b4414549bcb3da6550b5e46b1c5ac0ce76..f200198c58553751a97bc18a68f3e824e24d55af 100644 |
--- a/chrome/browser/resources/options/browser_options.js |
+++ b/chrome/browser/resources/options/browser_options.js |
@@ -405,6 +405,8 @@ cr.define('options', function() { |
if (loadTimeData.getBoolean('enableTimeZoneTrackingOption')) { |
$('resolve-timezone-by-geolocation-selection').hidden = false; |
this.setSystemTimezoneManaged_(false); |
+ $('timezone-value-select').disabled = loadTimeData.getBoolean( |
michaelpg
2015/02/19 22:38:36
Do we re-enable this dropdown if I uncheck the res
Alexander Alekseev
2015/02/19 22:41:55
Yes. See setSystemTimezoneManaged() code.
michaelpg
2015/02/24 06:38:06
Sorry, I'm confused. Assuming no enterprise policy
Alexander Alekseev
2015/02/24 12:18:30
setSystemTimezoneManaged() creates onclick handler
michaelpg
2015/02/24 13:04:39
Ah, I see. It's kind of unintuitive that we rely o
Alexander Alekseev
2015/02/25 20:39:41
This would lead to duplicate call to this new func
|
+ 'resolveTimezoneByGeolocationInitialValue'); |
} |
} |
@@ -2097,7 +2099,6 @@ cr.define('options', function() { |
*/ |
setCanSetTime_: function(canSetTime) { |
// If the time has been network-synced, it cannot be set manually. |
- $('time-synced-explanation').hidden = canSetTime; |
$('set-time').hidden = !canSetTime; |
}, |
@@ -2175,6 +2176,7 @@ cr.define('options', function() { |
'setMetricsReportingSettingVisibility', |
'setProfilesInfo', |
'setSpokenFeedbackCheckboxState', |
+ 'setSystemTimezoneManaged', |
michaelpg
2015/02/24 13:04:39
so this is an existing bug, since the function is
Alexander Alekseev
2015/02/25 20:39:41
Yes.
|
'setThemesResetButtonEnabled', |
'setVirtualKeyboardCheckboxState', |
'setupPageZoomSelector', |