| Index: chrome/browser/ui/views/aura/app_list/extension_app_item.cc
|
| diff --git a/chrome/browser/ui/views/aura/app_list/extension_app_item.cc b/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
|
| index a93ad1bd78375652d69d25bd4d2186a488849f93..53eec3ec5b4f814c4ce4f27b5a67c1bc00ab3a5e 100644
|
| --- a/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
|
| +++ b/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
|
| @@ -137,11 +137,11 @@ void ExtensionAppItem::LoadDefaultImage() {
|
| SetIcon(*rb.GetImageNamed(resource).ToSkBitmap());
|
| }
|
|
|
| -void ExtensionAppItem::OnImageLoaded(SkBitmap* image,
|
| - const ExtensionResource& resource,
|
| +void ExtensionAppItem::OnImageLoaded(const gfx::Image* image,
|
| + const std::string& extension_id,
|
| int tracker_index) {
|
| - if (image && !image->empty())
|
| - SetIcon(*image);
|
| + if (image && !image->IsEmpty())
|
| + SetIcon(*image->ToSkBitmap());
|
| else
|
| LoadDefaultImage();
|
| }
|
|
|