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

ui/aura_shell/root_window_event_filter.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_SHELL_ROOT_WINDOW_EVENT_FILTER_H_
 #define UI_AURA_SHELL_ROOT_WINDOW_EVENT_FILTER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
@@ skipping 22 matching lines @@
 
   // Overridden from EventFilter:
   virtual bool PreHandleKeyEvent(aura::Window* target,
                                  aura::KeyEvent* event) OVERRIDE;
   virtual bool PreHandleMouseEvent(aura::Window* target,
                                    aura::MouseEvent* event) OVERRIDE;
   virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
                                               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);
   ui::TouchStatus FilterTouchEvent(aura::Window* target,
                                    aura::TouchEvent* event);
 
   // Additional event filters that pre-handles events.
   ObserverList<aura::EventFilter, true> filters_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowEventFilter);
 };
 
 }  // namespace internal
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_ROOT_WINDOW_EVENT_FILTER_H_