| Index: chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
|
| diff --git a/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc b/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
|
| index 0d82d21b7059a40b45219182cfed62c389fdc10a..90dfbb7e000c275d334d88e2133ca1fbb3b9a711 100644
|
| --- a/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
|
| +++ b/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
|
| @@ -51,8 +51,8 @@ void LauncherIconLoader::FetchImage(const std::string& id) {
|
| ImageLoadingTracker::CACHE);
|
| }
|
|
|
| -void LauncherIconLoader::OnImageLoaded(SkBitmap* image,
|
| - const ExtensionResource& resource,
|
| +void LauncherIconLoader::OnImageLoaded(const gfx::Image& image,
|
| + const std::string& extension_id,
|
| int index) {
|
| ImageLoaderIDToExtensionIDMap::iterator i = map_.find(index);
|
| if (i == map_.end())
|
| @@ -60,7 +60,7 @@ void LauncherIconLoader::OnImageLoaded(SkBitmap* image,
|
|
|
| std::string id = i->second;
|
| map_.erase(i);
|
| - host_->SetAppImage(id, image);
|
| + host_->SetAppImage(id, image.ToSkBitmap());
|
| }
|
|
|
| const Extension* LauncherIconLoader::GetExtensionForTab(
|
|
|