| Index: chrome/browser/chromeos/login/users/avatar/user_image_loader.h
|
| diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h
|
| index fbea0781870c21d10c3548b3d9dda9436beff81a..3f72f89f07a6471d6c059ea26a71ee28840bcd0c 100644
|
| --- a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h
|
| +++ b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h
|
| @@ -19,9 +19,11 @@ namespace base {
|
| class SequencedTaskRunner;
|
| }
|
|
|
| -namespace chromeos {
|
| -
|
| +namespace user_manager {
|
| class UserImage;
|
| +}
|
| +
|
| +namespace chromeos {
|
|
|
| // Helper that reads, decodes and optionally resizes an image on a background
|
| // thread. Returns the image in the form of an SkBitmap.
|
| @@ -29,7 +31,8 @@ class UserImageLoader : public base::RefCountedThreadSafe<UserImageLoader>,
|
| public ImageDecoder::Delegate {
|
| public:
|
| // Callback used to return the result of an image load operation.
|
| - typedef base::Callback<void(const UserImage& user_image)> LoadedCallback;
|
| + typedef base::Callback<void(const user_manager::UserImage& user_image)>
|
| + LoadedCallback;
|
|
|
| // All file I/O, decoding and resizing are done via |background_task_runner|.
|
| UserImageLoader(
|
|
|