diff options
| author | dzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 11:23:37 +0000 |
|---|---|---|
| committer | dzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 11:23:37 +0000 |
| commit | e384a9f49236dde1d889fd0fc48e67f38fdffcc0 (patch) | |
| tree | 2dbd49346f86cc3241e2445aa730b59736ac85cb /chrome/browser/chromeos/login | |
| parent | 48d2c73c2d1ce273289f1fcd9a1d454aed824c97 (diff) | |
| download | chromium_src-e384a9f49236dde1d889fd0fc48e67f38fdffcc0.zip chromium_src-e384a9f49236dde1d889fd0fc48e67f38fdffcc0.tar.gz chromium_src-e384a9f49236dde1d889fd0fc48e67f38fdffcc0.tar.bz2 | |
First-run UI is enabled by default.
UI could be disabled by --disable-first-run-ui flag.
Suppresed loading of "Tips & Tricks" app in case when first-run UI is enabled.
BUG=269286
TBR=finnur
for extension_constants.*
Review URL: https://codereview.chromium.org/85293002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/login')
| -rw-r--r-- | chrome/browser/chromeos/login/login_display_host_impl.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc index e81e1ef..97432c7 100644 --- a/chrome/browser/chromeos/login/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/login_display_host_impl.cc @@ -53,6 +53,7 @@ #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_constants.h" #include "chromeos/chromeos_switches.h" @@ -365,11 +366,11 @@ LoginDisplayHostImpl::~LoginDisplayHostImpl() { default_host_ = NULL; // TODO(dzhioev): find better place for starting tutorial. - if (CommandLine::ForCurrentProcess()-> - HasSwitch(switches::kEnableFirstRunUI) && - (chromeos::UserManager::Get()->IsCurrentUserNew() || - CommandLine::ForCurrentProcess()-> - HasSwitch(switches::kForceFirstRunUI))) { + CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch(switches::kDisableFirstRunUI) && + ((chromeos::UserManager::Get()->IsCurrentUserNew() && + !command_line->HasSwitch(::switches::kTestType)) || + command_line->HasSwitch(switches::kForceFirstRunUI))) { // FirstRunController manages its lifetime and destructs after tutorial // completion. FirstRunController::Start(); |