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

ui/aura_shell/root_window_event_filter.h

Index: ui/aura_shell/root_window_event_filter.h
===================================================================
--- ui/aura_shell/root_window_event_filter.h	(revision 114099)
+++ ui/aura_shell/root_window_event_filter.h	(working copy)
@@ -40,11 +40,14 @@
                                               aura::TouchEvent* event) OVERRIDE;
 
  private:
+  // If necessary, activates |window| and changes focus.
+  void ActivateIfNecessary(aura::Window* window, aura::Event* event);
+
   // Updates the cursor if the target provides a custom one, and provides
   // default resize cursors for window edges.
   void UpdateCursor(aura::Window* target, aura::MouseEvent* event);
 
-  // Dispatches event to additional filters. Returns false or
+  // Dispatches event to addtional filters. Returns false or
   // ui::TOUCH_STATUS_UNKNOWN if event is consumed.
   bool FilterKeyEvent(aura::Window* target, aura::KeyEvent* event);
   bool FilterMouseEvent(aura::Window* target, aura::MouseEvent* event);
Property changes on: ui\aura_shell\root_window_event_filter.h
___________________________________________________________________
Added: svn:mergeinfo