Index: chrome/browser/extensions/image_loader.h |
diff --git a/chrome/browser/extensions/image_loader.h b/chrome/browser/extensions/image_loader.h |
index 7365269fb62a2ad309fbf4864d7e35cf6a2dad24..2eeae20f03adfa8589eafb4cc408e00a75ebfec4 100644 |
--- a/chrome/browser/extensions/image_loader.h |
+++ b/chrome/browser/extensions/image_loader.h |
@@ -28,6 +28,8 @@ namespace extensions { |
class Extension; |
+typedef base::Callback<void(const gfx::Image&)> ImageLoaderCallback; |
+ |
// This class is responsible for asynchronously loading extension images and |
// calling a callback when an image is loaded. |
// The views need to load their icons asynchronously might be deleted before |
@@ -91,26 +93,22 @@ class ImageLoader : public BrowserContextKeyedService { |
void LoadImageAsync(const extensions::Extension* extension, |
const ExtensionResource& resource, |
const gfx::Size& max_size, |
- const base::Callback<void(const gfx::Image&)>& callback); |
+ const ImageLoaderCallback& callback); |
// Same as LoadImage() above except it loads multiple images from the same |
// extension. This is used to load multiple resolutions of the same image |
// type. |
void LoadImagesAsync(const extensions::Extension* extension, |
const std::vector<ImageRepresentation>& info_list, |
- const base::Callback<void(const gfx::Image&)>& callback); |
+ const ImageLoaderCallback& callback); |
private: |
- base::WeakPtrFactory<ImageLoader> weak_ptr_factory_; |
+ void ReplyBack(const ImageLoaderCallback& callback, |
+ const std::vector<LoadResult>& load_result); |
- static void LoadImagesOnBlockingPool( |
- const std::vector<ImageRepresentation>& info_list, |
- const std::vector<SkBitmap>& bitmaps, |
- std::vector<LoadResult>* load_result); |
+ base::WeakPtrFactory<ImageLoader> weak_ptr_factory_; |
- void ReplyBack( |
- const std::vector<LoadResult>* load_result, |
- const base::Callback<void(const gfx::Image&)>& callback); |
+ DISALLOW_COPY_AND_ASSIGN(ImageLoader); |
}; |
} // namespace extensions |