Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1754)

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 17346003: Don't restart browser if UserFlow isn't going to launch browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: swapped checks Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 24cc11f623962922cf0032b5df469a883688ba11..6652cb68f9a290cb4a371a68393a3461ea0d9f12 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -282,6 +282,11 @@ void LoginUtilsImpl::DoBrowserLaunch(Profile* profile,
if (browser_shutdown::IsTryingToQuit())
return;
+ if (!UserManager::Get()->GetCurrentUserFlow()->ShouldLaunchBrowser()) {
+ UserManager::Get()->GetCurrentUserFlow()->LaunchExtraSteps(profile);
+ return;
+ }
+
CommandLine user_flags(CommandLine::NO_PROGRAM);
about_flags::PrefServiceFlagsStorage flags_storage_(profile->GetPrefs());
about_flags::ConvertFlagsToSwitches(&flags_storage_, &user_flags);
@@ -297,11 +302,6 @@ void LoginUtilsImpl::DoBrowserLaunch(Profile* profile,
return;
}
- if (!UserManager::Get()->GetCurrentUserFlow()->ShouldLaunchBrowser()) {
- UserManager::Get()->GetCurrentUserFlow()->LaunchExtraSteps(profile);
- return;
- }
-
if (login_host) {
login_host->SetStatusAreaVisible(true);
login_host->BeforeSessionStart();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698