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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_win.h

Issue 11787005: Get drag and drop working on Win Ash. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync and take out dcheck for win Created 7 years, 11 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: ui/base/dragdrop/os_exchange_data_provider_win.h
===================================================================
--- ui/base/dragdrop/os_exchange_data_provider_win.h (revision 175409)
+++ ui/base/dragdrop/os_exchange_data_provider_win.h (working copy)
@@ -20,6 +20,8 @@
#include "base/win/scoped_comptr.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/ui_export.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/vector2d.h"
namespace ui {
@@ -186,11 +188,23 @@
virtual bool HasCustomFormat(OSExchangeData::CustomFormat format) const;
virtual void SetDownloadFileInfo(
const OSExchangeData::DownloadFileInfo& download_info);
+#if defined(USE_AURA)
+ virtual void SetDragImage(const gfx::ImageSkia& image,
+ const gfx::Vector2d& cursor_offset) OVERRIDE;
+ virtual const gfx::ImageSkia& GetDragImage() const OVERRIDE;
+ virtual const gfx::Vector2d& GetDragImageOffset() const OVERRIDE;
+#endif
private:
scoped_refptr<DataObjectImpl> data_;
base::win::ScopedComPtr<IDataObject> source_object_;
+#if defined(USE_AURA)
+ // Drag image and offset data. Only used for Ash.
+ gfx::ImageSkia drag_image_;
+ gfx::Vector2d drag_image_offset_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderWin);
};
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aura.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698