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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.cc

Issue 10834368: Convert mostly favicon related code from SkBitmap to ImageSkia and Image (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/omnibox/omnibox_view_win.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index 7a21dffaf2725ab1ebf4117e8c2f641f2278ea5e..37b98d713f0acb42db4d88348895f491efc5b15e 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -2489,11 +2489,11 @@ void OmniboxViewWin::StartDragIfNecessary(const CPoint& point) {
if (write_url) {
string16 title;
- SkBitmap favicon;
+ gfx::Image favicon;
if (is_all_selected)
model()->GetDataForURLExport(&url, &title, &favicon);
- button_drag_utils::SetURLAndDragImage(url, title, favicon, &data,
- native_view_host_->GetWidget());
+ button_drag_utils::SetURLAndDragImage(url, title, favicon.AsImageSkia(),
+ &data, native_view_host_->GetWidget());
supported_modes |= DROPEFFECT_LINK;
content::RecordAction(UserMetricsAction("Omnibox_DragURL"));
} else {

Powered by Google App Engine
This is Rietveld 408576698