| Index: chrome/browser/ui/views/ash/app_list/extension_app_item.cc
|
| diff --git a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
|
| index 44722013c6cb4a3a714beba949b60461eaef2dda..68ed3ccf202f1f4007f616fe33b2b500cb7c82e5 100644
|
| --- a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
|
| +++ b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
|
| @@ -152,13 +152,12 @@ const Extension* ExtensionAppItem::GetExtension() const {
|
|
|
| void ExtensionAppItem::LoadImage(const Extension* extension) {
|
| tracker_.reset(new ImageLoadingTracker(this));
|
| - tracker_->LoadImage(extension,
|
| - extension->GetIconResource(
|
| - ExtensionIconSet::EXTENSION_ICON_LARGE,
|
| - ExtensionIconSet::MATCH_BIGGER),
|
| - gfx::Size(ExtensionIconSet::EXTENSION_ICON_LARGE,
|
| - ExtensionIconSet::EXTENSION_ICON_LARGE),
|
| - ImageLoadingTracker::DONT_CACHE);
|
| + tracker_->LoadDIPImage(
|
| + extension,
|
| + ExtensionIconSet::EXTENSION_ICON_MEDIUM,
|
| + gfx::Size(ExtensionIconSet::EXTENSION_ICON_MEDIUM,
|
| + ExtensionIconSet::EXTENSION_ICON_MEDIUM),
|
| + ImageLoadingTracker::DONT_CACHE);
|
| }
|
|
|
| void ExtensionAppItem::ShowExtensionOptions() {
|
| @@ -188,7 +187,7 @@ void ExtensionAppItem::OnImageLoaded(const gfx::Image& image,
|
| const std::string& extension_id,
|
| int tracker_index) {
|
| if (!image.IsEmpty())
|
| - SetIcon(*image.ToSkBitmap());
|
| + SetIcon(*image.ToImageSkia());
|
| else
|
| SetIcon(Extension::GetDefaultIcon(true /* is_app */));
|
| }
|
|
|