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

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: Fix bookmarks interactive tests since now that DRWHW::GetLocationOnNativeScreen is fixed ui_control… 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 171535)
+++ 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/widget/native_widget_private.h"
@@ -20,13 +21,15 @@
namespace views {
class DesktopRootWindowHost;
+class DropHelper;
class NativeWidgetAuraWindowObserver;
// TODO(erg): May also need to be a DragDropDelegate
class VIEWS_EXPORT DesktopNativeWidgetAura
: public internal::NativeWidgetPrivate,
public aura::WindowDelegate,
- public aura::client::ActivationDelegate {
+ public aura::client::ActivationDelegate,
+ public aura::client::DragDropDelegate {
public:
explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate);
virtual ~DesktopNativeWidgetAura();
@@ -160,6 +163,12 @@
virtual void OnActivated() OVERRIDE;
virtual void OnLostActive() 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_;
@@ -184,6 +193,9 @@
scoped_ptr<aura::client::StackingClient> stacking_client_;
+ scoped_ptr<DropHelper> drop_helper_;
+ int last_drop_operation_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
};

Powered by Google App Engine
This is Rietveld 408576698