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..d4a0f6055603f35281ab1c03705d2738920f5e37 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 |
@@ -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( |