chrome/browser/chromeos/login/users/mock_user_manager.h - Issue 376193002: Move UserImage to user_manager

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

Issue 376193002: Move UserImage to user_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: bring back gfx::ImageSkia Created 6 years, 5 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/users/mock_user_manager.h

diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h

index feb24b8ab3c7a3c60d7729afb326e8216d43bcf0..a33f9e2558d2b5038339277ebb60946d36e9f671 100644

--- a/chrome/browser/chromeos/login/users/mock_user_manager.h

+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h

@@ -11,9 +11,9 @@

#include "base/memory/weak_ptr.h"

#include "chrome/browser/chromeos/login/user_flow.h"

#include "chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h"

-#include "chrome/browser/chromeos/login/users/avatar/user_image.h"

#include "chrome/browser/chromeos/login/users/user.h"

#include "chrome/browser/chromeos/login/users/user_manager.h"

+#include "components/user_manager/avatar/user_image.h"

#include "testing/gmock/include/gmock/gmock.h"

namespace chromeos {