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

Unified Diff: ui/base/dragdrop/drag_utils_aura.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/base/dragdrop/drag_utils.cc ('k') | ui/base/dragdrop/drag_utils_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dragdrop/drag_utils_aura.cc
diff --git a/ui/base/dragdrop/drag_utils_aura.cc b/ui/base/dragdrop/drag_utils_aura.cc
index 54a78c6ce5fff1f2fb1234569020684c1023f01b..63a22aa0a0c339511b44ef092b22623f7df03144 100644
--- a/ui/base/dragdrop/drag_utils_aura.cc
+++ b/ui/base/dragdrop/drag_utils_aura.cc
@@ -5,22 +5,22 @@
#include "ui/base/dragdrop/drag_utils.h"
#include "base/logging.h"
-#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/point.h"
#include "ui/gfx/size.h"
namespace drag_utils {
-void SetDragImageOnDataObject(const SkBitmap& bitmap,
+void SetDragImageOnDataObject(const gfx::ImageSkia& image,
const gfx::Size& size,
const gfx::Point& cursor_offset,
ui::OSExchangeData* data_object) {
ui::OSExchangeDataProviderAura& provider(
static_cast<ui::OSExchangeDataProviderAura&>(data_object->provider()));
- provider.set_drag_image(bitmap);
+ provider.set_drag_image(image);
provider.set_drag_image_offset(cursor_offset);
}
« no previous file with comments | « ui/base/dragdrop/drag_utils.cc ('k') | ui/base/dragdrop/drag_utils_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698