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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.cc

Issue 10332163: Revert 137075 - Get rid of Image::Image(SkBitmap*) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/tools/profiles/generate_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
===================================================================
--- chrome/browser/ui/intents/web_intent_picker_controller.cc (revision 137075)
+++ chrome/browser/ui/intents/web_intent_picker_controller.cc (working copy)
@@ -529,7 +529,7 @@
if (gfx::PNGCodec::Decode(favicon_data.image_data->front(),
favicon_data.image_data->size(),
&icon_bitmap)) {
- gfx::Image icon_image(icon_bitmap);
+ gfx::Image icon_image(new SkBitmap(icon_bitmap));
picker_model_->UpdateFaviconAt(index, icon_image);
return;
}
@@ -633,7 +633,7 @@
icon_bitmap,
skia::ImageOperations::RESIZE_BEST,
gfx::kFaviconSize, gfx::kFaviconSize);
- gfx::Image icon_image(resized_icon);
+ gfx::Image icon_image(new SkBitmap(resized_icon));
content::BrowserThread::PostTask(
content::BrowserThread::UI,
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/tools/profiles/generate_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698