summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 02:57:08 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 02:57:08 +0000
commit18066cbe2444db3ea0792a520076c8b332289c42 (patch)
tree21a2cbbfff452284af108a8bb05a8f978f1d6f2b /chrome/browser/resources
parent5a32e1930331fc230e1a5b8548a803e48a531c1d (diff)
downloadchromium_src-18066cbe2444db3ea0792a520076c8b332289c42.zip
chromium_src-18066cbe2444db3ea0792a520076c8b332289c42.tar.gz
chromium_src-18066cbe2444db3ea0792a520076c8b332289c42.tar.bz2
Disallow non-owners from modifying the timezone setting
BUG=chromium-os:8176 TEST=Log in as a non-owner. Attempt to change the time zone. Review URL: http://codereview.chromium.org/5391001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/options/chromeos_system_options.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/chromeos_system_options.js b/chrome/browser/resources/options/chromeos_system_options.js
index 2e99193..2098303 100644
--- a/chrome/browser/resources/options/chromeos_system_options.js
+++ b/chrome/browser/resources/options/chromeos_system_options.js
@@ -32,9 +32,9 @@ 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
+ // Disable the timezone setting for non-owners, as this is a
// system wide setting.
- if (cr.commandLine.options['--bwsi']) {
+ if (!AccountsOptions.currentUserIsOwner()) {
timezone.disabled = true;
// Mark that this is manually disabled. See also pref_ui.js.
timezone.manually_disabled = true;