diff options
| author | merkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 08:45:37 +0000 |
|---|---|---|
| committer | merkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 08:45:37 +0000 |
| commit | 5837641caadb6971b3dc079a90ecdbcec1e6fb42 (patch) | |
| tree | 9200739ab8706d66fa81aa29848b0a23a4905801 | |
| parent | 8b94ef541d5b342a81082be0ff8b11432cbe6985 (diff) | |
| download | chromium_src-5837641caadb6971b3dc079a90ecdbcec1e6fb42.zip chromium_src-5837641caadb6971b3dc079a90ecdbcec1e6fb42.tar.gz chromium_src-5837641caadb6971b3dc079a90ecdbcec1e6fb42.tar.bz2 | |
Merge 281706 "DisableDemoMode flag check added for HID detection..."
> DisableDemoMode flag check added for HID detection screen.
>
> BUG=389621
>
> Review URL: https://codereview.chromium.org/376853002
TBR=merkulova@chromium.org
Review URL: https://codereview.chromium.org/487173002
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290520 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc index a1eab10..5babef6 100644 --- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/metrics/histogram.h" @@ -15,6 +16,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/pref_names.h" +#include "chromeos/chromeos_switches.h" #include "device/bluetooth/bluetooth_adapter_factory.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -112,7 +114,8 @@ void HIDDetectionScreenHandler::Show() { show_on_init_ = true; return; } - core_oobe_actor_->InitDemoModeDetection(); + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableDemoMode)) + core_oobe_actor_->InitDemoModeDetection(); input_service_proxy_.AddObserver(this); first_time_screen_show_ = true; GetDevicesFirstTime(); |