diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 18:39:43 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 18:39:43 +0000 |
| commit | 56f7162f8528e744cd765978d1a6102ed0bd1add (patch) | |
| tree | 5ad9ca6d13240f7b10fc74c443c0c080afa900cc | |
| parent | f662fcb68b9e014e351670bf2fd38440257ac125 (diff) | |
| download | chromium_src-56f7162f8528e744cd765978d1a6102ed0bd1add.zip chromium_src-56f7162f8528e744cd765978d1a6102ed0bd1add.tar.gz chromium_src-56f7162f8528e744cd765978d1a6102ed0bd1add.tar.bz2 | |
Fix CrOS M28 build (bad merge 202699)
TBR=xiyuan
TEST=compiles
Review URL: https://codereview.chromium.org/15969007
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@202922 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/options/browser_options_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 32400f8..8112a71 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -474,7 +474,7 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) { CommandLine::ForCurrentProcess()->HasSwitch( chromeos::switches::kEnableKioskAppSettings) && !CommandLine::ForCurrentProcess()->HasSwitch( - chromeos::switches::kDisableAppMode) && + switches::kDisableAppMode) && (chromeos::UserManager::Get()->IsCurrentUserOwner() || !base::chromeos::IsRunningOnChromeOS())); #endif |