chrome/browser/chromeos/login/mock_user_manager.h - Issue 10454044: Added support for animated/nonanimated user image.

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 10454044: Added support for animated/nonanimated user image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Comment is fixed. Created 8 years, 6 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

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

index 295028b33102b73115d11aa1a129a4f6feda4bf9..c634be67d0701515f996b33cad0c8dacde426833 100644

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

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

@@ -9,6 +9,7 @@

#include <string>

#include "base/file_path.h"

+#include "chrome/browser/chromeos/login/user_image.h"

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

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

@@ -44,7 +45,7 @@ class MockUserManager : public UserManager {

int));

MOCK_CONST_METHOD1(GetUserDisplayEmail, std::string(const std::string&));

MOCK_METHOD2(SaveUserDefaultImageIndex, void(const std::string&, int));

- MOCK_METHOD2(SaveUserImage, void(const std::string&, const SkBitmap&));

+ MOCK_METHOD2(SaveUserImage, void(const std::string&, const UserImage&));

MOCK_METHOD1(SetLoggedInUserCustomWallpaperLayout,void(

ash::WallpaperLayout));

MOCK_METHOD2(SaveUserImageFromFile, void(const std::string&,