Revert 114095 - Move the concept of Activation to the Shell.

ui/views/widget/native_widget_aura.h

Index: ui/views/widget/native_widget_aura.h
===================================================================
--- ui/views/widget/native_widget_aura.h	(revision 114099)
+++ ui/views/widget/native_widget_aura.h	(working copy)
@@ -8,7 +8,6 @@
 
 #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/base/events.h"
@@ -29,7 +28,6 @@
 
 class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
                                       public aura::WindowDelegate,
-                                      public aura::ActivationDelegate,
                                       public aura::WindowDragDropDelegate {
  public:
   explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
@@ -134,17 +132,15 @@
   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;
@@ -155,7 +151,7 @@
   internal::NativeWidgetDelegate* delegate() { return delegate_; }
 
  private:
-  class ActiveWindowObserver;
+  class RootWindowObserverImpl;
 
   internal::NativeWidgetDelegate* delegate_;
 
@@ -175,7 +171,7 @@
 
   scoped_ptr<TooltipManagerAura> tooltip_manager_;
 
-  scoped_ptr<ActiveWindowObserver> active_window_observer_;
+  scoped_ptr<RootWindowObserverImpl> root_window_observer_;
 
   scoped_ptr<DropHelper> drop_helper_;
 
Property changes on: ui\views\widget\native_widget_aura.h
___________________________________________________________________
Added: svn:mergeinfo