Chromium Code Reviews| 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 2dbfc5d0d5b7bee16236aa53c61d34a34429146d..aa4707329baf91a4ace638e0b6f838cdb50c7206 100644 |
| --- a/chrome/browser/resources/options/browser_options.js |
| +++ b/chrome/browser/resources/options/browser_options.js |
| @@ -384,8 +384,16 @@ cr.define('options', function() { |
| } |
| // Date and time section (CrOS only). |
| - if ($('set-time-button')) |
| - $('set-time-button').onclick = this.handleSetTime_.bind(this); |
| + if (cr.isChromeOS) { |
| + if ($('set-time-button')) |
| + $('set-time-button').onclick = this.handleSetTime_.bind(this); |
| + |
| + // Timezone |
| + if (loadTimeData.getBoolean('enableTimeZoneTrackingOption')) { |
| + $('resolve-timezone-by-geolocation-selection').hidden = false; |
| + this.setSystemTimezoneManaged_(false); |
| + } |
| + } |
| // Default browser section. |
| if (!cr.isChromeOS) { |
| @@ -1613,6 +1621,26 @@ cr.define('options', function() { |
| }, |
| /** |
|
stevenjb
2015/01/29 18:29:20
Brief description of function. Be sure to mention
Alexander Alekseev
2015/01/29 19:51:08
Done.
|
| + * @param {boolean} managed |
|
stevenjb
2015/01/29 18:29:20
Describe parameter
Alexander Alekseev
2015/01/29 19:51:08
Done.
|
| + */ |
| + setSystemTimezoneManaged_: function(managed) { |
| + if (loadTimeData.getBoolean('enableTimeZoneTrackingOption')) { |
| + if (managed) { |
| + $('resolve-timezone-by-geolocation-selection').disabled = true; |
| + $('resolve-timezone-by-geolocation').onclick = function(event) {}; |
| + } else { |
| + this.enableElementIfPossible_( |
| + getRequiredElement('resolve-timezone-by-geolocation-selection')); |
| + $('resolve-timezone-by-geolocation').onclick = function(event) { |
| + $('timezone-value-select').disabled = event.currentTarget.checked; |
| + }; |
| + $('timezone-value-select').disabled = |
| + $('resolve-timezone-by-geolocation').checked; |
| + } |
| + } |
| + }, |
| + |
| + /** |
| * Handle the 'add device' button click. |
| * @private |
| */ |