chrome/browser/chromeos/login/existing_user_controller.cc - Issue 6353007: ExistingUserController is used for login under automation tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6353007: ExistingUserController is used for login under automation tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed browsertests Created 9 years, 11 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:

Index: chrome/browser/chromeos/login/existing_user_controller.cc

diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc

index 05956866583a615bddb2a9b4ea5303ee85f599af..d6bb6eac067327fa25f83b582edc17ae8e5dd145 100644

--- a/chrome/browser/chromeos/login/existing_user_controller.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller.cc

@@ -543,9 +543,13 @@ void ExistingUserController::OnLoginSuccess(

LoginPerformer* performer = login_performer_.release();

performer = NULL;

bool known_user = UserManager::Get()->IsKnownUser(username);

+ bool login_only =

+ CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

+ switches::kLoginScreen) == WizardController::kLoginScreenName;

AppendStartUrlToCmdline();

controllers_[selected_view_index_]->StopThrobber();

- if (selected_view_index_ + 1 == controllers_.size() && !known_user) {

+ if (selected_view_index_ + 1 == controllers_.size() &&

+ !known_user && !login_only) {

#if defined(OFFICIAL_BUILD)

CommandLine::ForCurrentProcess()->AppendSwitchPath(

switches::kLoadExtension,