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); |
}; |