Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h |
=================================================================== |
--- ui/views/widget/desktop_aura/desktop_native_widget_aura.h (revision 171879) |
+++ ui/views/widget/desktop_aura/desktop_native_widget_aura.h (working copy) |
@@ -7,6 +7,7 @@ |
#include "base/memory/weak_ptr.h" |
#include "ui/aura/client/activation_delegate.h" |
+#include "ui/aura/client/drag_drop_delegate.h" |
#include "ui/aura/window_delegate.h" |
#include "ui/views/ime/input_method_delegate.h" |
#include "ui/views/widget/native_widget_private.h" |
@@ -26,6 +27,7 @@ |
} |
class DesktopRootWindowHost; |
+class DropHelper; |
class NativeWidgetAuraWindowObserver; |
// TODO(erg): May also need to be a DragDropDelegate |
@@ -33,7 +35,8 @@ |
: public internal::NativeWidgetPrivate, |
public aura::WindowDelegate, |
public aura::client::ActivationDelegate, |
- public views::internal::InputMethodDelegate { |
+ public views::internal::InputMethodDelegate, |
+ public aura::client::DragDropDelegate { |
public: |
explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate); |
virtual ~DesktopNativeWidgetAura(); |
@@ -180,6 +183,12 @@ |
// Overridden from views::internal::InputMethodDelegate: |
virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE; |
+ // Overridden from aura::client::DragDropDelegate: |
+ virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; |
+ virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; |
+ virtual void OnDragExited() OVERRIDE; |
+ virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; |
+ |
private: |
// See class documentation for Widget in widget.h for a note about ownership. |
Widget::InitParams::Ownership ownership_; |
@@ -209,6 +218,9 @@ |
scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_; |
+ scoped_ptr<DropHelper> drop_helper_; |
+ int last_drop_operation_; |
+ |
DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
}; |