| Index: chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
|
| diff --git a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
|
| index 83f22bfe0568f4ce81dd7d0ee9b136d7d17ad352..a429f61eec51366526502c5892d6a133ebbbb90a 100644
|
| --- a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
|
| +++ b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
|
| @@ -44,10 +44,10 @@ void LauncherAppIconLoader::FetchImage(const std::string& id) {
|
| if (!image_loader_.get())
|
| image_loader_.reset(new ImageLoadingTracker(this));
|
| map_[image_loader_->next_id()] = id;
|
| - image_loader_->LoadImage(
|
| +
|
| + image_loader_->LoadDIPImage(
|
| extension,
|
| - extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALL,
|
| - ExtensionIconSet::MATCH_BIGGER),
|
| + ExtensionIconSet::EXTENSION_ICON_SMALL,
|
| gfx::Size(ExtensionIconSet::EXTENSION_ICON_SMALL,
|
| ExtensionIconSet::EXTENSION_ICON_SMALL),
|
| ImageLoadingTracker::CACHE);
|
| @@ -63,9 +63,9 @@ void LauncherAppIconLoader::OnImageLoaded(const gfx::Image& image,
|
| std::string id = i->second;
|
| map_.erase(i);
|
| if (image.IsEmpty())
|
| - host_->SetAppImage(id, NULL);
|
| + host_->SetAppImage(id, extensions::Extension::GetDefaultIcon(true));
|
| else
|
| - host_->SetAppImage(id, image.ToSkBitmap());
|
| + host_->SetAppImage(id, *image.ToImageSkia());
|
| }
|
|
|
| const extensions::Extension* LauncherAppIconLoader::GetExtensionForTab(
|
|
|