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

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 11444013: Get drag and drop working for win aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 8 years 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/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);
};
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drop_target_win.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698