Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1310)

Unified Diff: chrome/browser/ui/views/aura/app_list/extension_app_item.cc

Issue 9586018: Add support for multiple icon sizes for Mac platform apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3abb60a0b6a569e6af003641b1407900f08f3c8f..63e5418e8f328ab321ff7fc6453dd0352e7320ba 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
@@ -136,11 +136,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.IsEmpty())
+ SetIcon(*image.ToSkBitmap());
else
LoadDefaultImage();
}

Powered by Google App Engine
This is Rietveld 408576698