diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/resources/options/chromeos_system_options.js | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/resources/options/chromeos_system_options.js')
| -rw-r--r-- | chrome/browser/resources/options/chromeos_system_options.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/resources/options/chromeos_system_options.js b/chrome/browser/resources/options/chromeos_system_options.js index cef3507..2e99193 100644 --- a/chrome/browser/resources/options/chromeos_system_options.js +++ b/chrome/browser/resources/options/chromeos_system_options.js @@ -32,6 +32,13 @@ cr.define('options', function() { var timezone = $('timezone-select'); if (timezone) { timezone.initializeValues(templateData.timezoneList); + // Disable the timezone setting for the guest mode, as this is a + // system wide setting. + if (cr.commandLine.options['--bwsi']) { + timezone.disabled = true; + // Mark that this is manually disabled. See also pref_ui.js. + timezone.manually_disabled = true; + } } $('language-button').onclick = function(event) { |