chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h - Issue 931993002: Make image_decoder a Leaky LazyInstance

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

Issue 931993002: Make image_decoder a Leaky LazyInstance (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix a few comments Created 5 years, 9 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/users/avatar/user_image_loader.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 93b992d4007f535bcb763f5f42a8142bbe9349b8..6e237ecdbf80581fe9052ee27e25e99ab1f2272f 100644

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

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

@@ -31,17 +31,16 @@ extern const char kUserAvatarImage2RelativePath[];

// Returns |true| if the two given images are pixel-for-pixel identical.

bool AreImagesEqual(const gfx::ImageSkia& first, const gfx::ImageSkia& second);

-class ImageLoader : public ImageDecoder::Delegate {

+class ImageLoader : public ImageDecoder::ImageRequest {

public:

explicit ImageLoader(const base::FilePath& path);

~ImageLoader() override;

scoped_ptr<gfx::ImageSkia> Load();

- // ImageDecoder::Delegate:

- void OnImageDecoded(const ImageDecoder* decoder,

- const SkBitmap& decoded_image) override;

- void OnDecodeImageFailed(const ImageDecoder* decoder) override;

+ // ImageDecoder::ImageRequest:

+ void OnImageDecoded(const SkBitmap& decoded_image) override;

+ void OnDecodeImageFailed() override;

private:

base::FilePath path_;