| Index: chrome/browser/ui/webui/extensions/extension_icon_source.h
|
| diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h
|
| index d790748c452952d8808017305de2c718afb83f4b..4ea40fe8c3961fc7d928e810f089ae9451d203c1 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h
|
| +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h
|
| @@ -90,7 +90,7 @@ class ExtensionIconSource : public ChromeURLDataManager::DataSource,
|
| // Performs any remaining transformations (like desaturating the |image|),
|
| // then returns the |image| to the client and clears up any temporary data
|
| // associated with the |request_id|.
|
| - void FinalizeImage(SkBitmap* image, int request_id);
|
| + void FinalizeImage(const SkBitmap* image, int request_id);
|
|
|
| // Loads the default image for |request_id| and returns to the client.
|
| void LoadDefaultImage(int request_id);
|
| @@ -114,8 +114,8 @@ class ExtensionIconSource : public ChromeURLDataManager::DataSource,
|
| history::FaviconData favicon);
|
|
|
| // ImageLoadingTracker::Observer
|
| - virtual void OnImageLoaded(SkBitmap* image,
|
| - const ExtensionResource& resource,
|
| + virtual void OnImageLoaded(const gfx::Image& image,
|
| + const std::string& extension_id,
|
| int id) OVERRIDE;
|
|
|
| // Called when the extension doesn't have an icon. We fall back to multiple
|
|
|