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

Unified Diff: ui/views/button_drag_utils.cc

Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia (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 | « ui/views/button_drag_utils.h ('k') | ui/views/painter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/button_drag_utils.cc
diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc
index d65bc292d0b7ff9044a05cdfb9fe507216da4142..da52b9cbbfe32c469a43c9d410335b800e0a30a4 100644
--- a/ui/views/button_drag_utils.cc
+++ b/ui/views/button_drag_utils.cc
@@ -21,7 +21,7 @@ static const int kLinkDragImageMaxWidth = 200;
void SetURLAndDragImage(const GURL& url,
const string16& title,
- const SkBitmap& icon,
+ const gfx::ImageSkia& icon,
ui::OSExchangeData* data) {
DCHECK(url.is_valid() && data);
@@ -33,7 +33,7 @@ void SetURLAndDragImage(const GURL& url,
button.set_max_width(kLinkDragImageMaxWidth);
if (icon.isNull()) {
button.SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_DEFAULT_FAVICON).ToSkBitmap());
+ IDR_DEFAULT_FAVICON).ToImageSkia());
} else {
button.SetIcon(icon);
}
« no previous file with comments | « ui/views/button_drag_utils.h ('k') | ui/views/painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698