Index: ui/views/widget/native_widget_aura.h |
=================================================================== |
--- ui/views/widget/native_widget_aura.h (revision 113647) |
+++ ui/views/widget/native_widget_aura.h (working copy) |
@@ -8,8 +8,10 @@ |
#include "base/memory/scoped_vector.h" |
#include "base/memory/weak_ptr.h" |
+#include "ui/aura/client/activation_delegate.h" |
#include "ui/aura/client/window_drag_drop_delegate.h" |
#include "ui/aura/window_delegate.h" |
+#include "ui/aura/window_observer.h" |
sky
2011/12/09 23:11:23
I think you can move this to to the .cc.
|
#include "ui/base/events.h" |
#include "ui/views/views_export.h" |
#include "ui/views/widget/native_widget_private.h" |
@@ -28,6 +30,7 @@ |
class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, |
public aura::WindowDelegate, |
+ public aura::ActivationDelegate, |
public aura::WindowDragDropDelegate { |
public: |
explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate); |
@@ -132,15 +135,17 @@ |
virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; |
virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; |
virtual bool CanFocus() OVERRIDE; |
- virtual bool ShouldActivate(aura::Event* event) OVERRIDE; |
- virtual void OnActivated() OVERRIDE; |
- virtual void OnLostActive() OVERRIDE; |
virtual void OnCaptureLost() OVERRIDE; |
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
virtual void OnWindowDestroying() OVERRIDE; |
virtual void OnWindowDestroyed() OVERRIDE; |
virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; |
+ // Overridden from aura::ActivationDelegate: |
+ virtual bool ShouldActivate(aura::Event* event) OVERRIDE; |
+ virtual void OnActivated() OVERRIDE; |
+ virtual void OnLostActive() OVERRIDE; |
+ |
// Overridden from aura::WindowDragDropDelegate: |
virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE; |
virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE; |