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

ui/aura/window_delegate.h

Index: ui/aura/window_delegate.h
===================================================================
--- ui/aura/window_delegate.h	(revision 114099)
+++ ui/aura/window_delegate.h	(working copy)
@@ -55,6 +55,18 @@
   // Returns true of the window can be focused.
   virtual bool CanFocus() = 0;
 
+  // Returns true if the window should be activated. |event| is either the mouse
+  // event supplied if the activation is the result of a mouse, or the touch
+  // event if the activation is the result of a touch, or NULL if activation is
+  // attempted for another reason.
+  virtual bool ShouldActivate(Event* event) = 0;
+
+  // Sent when the window is activated.
+  virtual void OnActivated() = 0;
+
+  // Sent when the window loses active status.
+  virtual void OnLostActive() = 0;
+
   // Invoked when mouse capture is lost on the window.
   virtual void OnCaptureLost() = 0;
 
Property changes on: ui\aura\window_delegate.h
___________________________________________________________________
Added: svn:mergeinfo