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) {