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

Unified Diff: views/widget/native_widget_aura.h

Issue 8450018: First shot at implementing drag&drop for Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed windows build errors Created 9 years, 1 month 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 | « views/views.gyp ('k') | views/widget/native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/native_widget_aura.h
diff --git a/views/widget/native_widget_aura.h b/views/widget/native_widget_aura.h
index c93c61b21feae3a8fe6784d901cfe4b5226f64ad..151bdd6ea62492e2ff07e50ebd6cada21c098d25 100644
--- a/views/widget/native_widget_aura.h
+++ b/views/widget/native_widget_aura.h
@@ -8,6 +8,7 @@
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
+#include "ui/aura/client/window_drag_drop_delegate.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/events.h"
#include "views/views_export.h"
@@ -22,10 +23,12 @@ class Font;
namespace views {
+class DropHelper;
class TooltipManagerViews;
class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
- public aura::WindowDelegate {
+ public aura::WindowDelegate,
+ public aura::WindowDragDropDelegate {
public:
explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
virtual ~NativeWidgetAura();
@@ -139,6 +142,13 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
virtual void OnWindowDestroyed() OVERRIDE;
virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
+ // Overridden from aura::WindowDragDropDelegate:
+ virtual bool CanDrop(const aura::DropTargetEvent& event) OVERRIDE;
+ virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE;
+ virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE;
+ virtual void OnDragExited() OVERRIDE;
+ virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE;
+
private:
class DesktopObserverImpl;
@@ -162,6 +172,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
scoped_ptr<DesktopObserverImpl> desktop_observer_;
+ scoped_ptr<DropHelper> drop_helper_;
+
DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
};
« no previous file with comments | « views/views.gyp ('k') | views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698