chrome/browser/chromeos/login/users/avatar/mock_user_image_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/avatar/mock_user_image_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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/screens/user_image_screen.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image.h » ('j') | components/user_manager.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h

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

index 83fa62ee22ec7e8e2a9d5c2b245f33e720a1fc90..589b38e4afdacadfeac57583408368da7955be6f 100644

--- a/chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h

+++ b/chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h

@@ -8,8 +8,8 @@

#include <string>

#include "base/files/file_path.h"

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

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

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

Denis Kuznetsov (DE-MUC) 2014/07/09 15:56:35 Could you get replace "avatar" with "user_manager"

Nikita (slow) 2014/07/09 16:15:01 Done.

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

namespace chromeos {

@@ -20,7 +20,7 @@ class MockUserImageManager : public UserImageManager {

virtual ~MockUserImageManager();

MOCK_METHOD1(SaveUserDefaultImageIndex, void(int));

- MOCK_METHOD1(SaveUserImage, void(const UserImage&));

+ MOCK_METHOD1(SaveUserImage, void(const user_manager::UserImage&));

MOCK_METHOD1(SaveUserImageFromFile, void(const base::FilePath&));

MOCK_METHOD0(SaveUserImageFromProfileImage, void());

MOCK_METHOD1(DownloadProfileImage, void(const std::string&));