Index: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc |
diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc |
index 342e828997ad498abfbe968eb8520f46f2108118..221690459589cdcd9dac118118feee267bbc8055 100644 |
--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc |
+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc |
@@ -345,7 +345,7 @@ ash::LauncherID ChromeLauncherController::GetLauncherIDForAppID( |
} |
void ChromeLauncherController::SetAppImage(const std::string& id, |
- const SkBitmap* image) { |
+ const gfx::ImageSkia& image) { |
// TODO: need to get this working for shortcuts. |
for (IDToItemMap::const_iterator i = id_to_item_map_.begin(); |
@@ -365,7 +365,7 @@ void ChromeLauncherController::SetAppImage(const std::string& id, |
int index = model_->ItemIndexByID(i->first); |
ash::LauncherItem item = model_->items()[index]; |
- item.image = image ? *image : Extension::GetDefaultIcon(true); |
+ item.image = image; |
model_->Set(index, item); |
// It's possible we're waiting on more than one item, so don't break. |
} |