chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 6902107: Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

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_browsertest.cc

Issue 6902107: Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest (Closed) Base URL: svn://svn.chromium.org/chrome/branches/742/src/

Patch Set: Created 9 years, 8 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

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

===================================================================

--- chrome/browser/chromeos/login/existing_user_controller_browsertest.cc (revision 83304)

+++ chrome/browser/chromeos/login/existing_user_controller_browsertest.cc (working copy)

@@ -65,8 +65,7 @@

MOCK_METHOD1(SetStatusAreaEnabled, void(bool));

MOCK_METHOD1(SetStatusAreaVisible, void(bool));

MOCK_METHOD0(ShowBackground, void(void));

- MOCK_METHOD3(StartWizard, void(const std::string&,

- const chromeos::StartupCustomizationDocument*,

+ MOCK_METHOD2(StartWizard, void(const std::string&,

const GURL&));

MOCK_METHOD0(StartSignInScreen, void(void));

@@ -182,7 +181,6 @@

.Times(1);

EXPECT_CALL(*mock_login_display_host_,

StartWizard(WizardController::kUserImageScreenName,

- NULL,

GURL()))

.Times(1);

EXPECT_CALL(*mock_login_display_, OnFadeOut())

« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/helper.h » ('j') | no next file with comments »