chrome/browser/chromeos/login/mock_user_manager.h - Issue 12335051: Merge 182894 - 3rd attempt

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/mock_user_manager.h

Issue 12335051: Merge 182894 - 3rd attempt (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 10 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/mock_user_manager.h

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

--- chrome/browser/chromeos/login/mock_user_manager.h (revision 184220)

+++ chrome/browser/chromeos/login/mock_user_manager.h (working copy)

@@ -60,6 +60,8 @@

MOCK_METHOD1(AddObserver, void(UserManager::Observer*));

MOCK_METHOD1(RemoveObserver, void(UserManager::Observer*));

MOCK_METHOD0(NotifyLocalStateChanged, void(void));

+ MOCK_CONST_METHOD0(GetMergeSessionState, MergeSessionState(void));

+ MOCK_METHOD1(SetMergeSessionState, void(MergeSessionState));

// You can't mock this function easily because nobody can create User objects

// but the UserManagerImpl and us.