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

ui/aura_shell/root_window_event_filter.cc

 // 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.
 
 #include "ui/aura_shell/root_window_event_filter.h"
 
 #include "ui/aura/event.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
-#include "ui/aura_shell/activation_controller.h"
 #include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/window_util.h"
+#include "ui/aura_shell/stacking_controller.h"
 #include "ui/base/hit_test.h"
 
 namespace aura_shell {
 namespace internal {
 
 // Returns the default cursor for a window component.
 gfx::NativeCursor CursorForWindowComponent(int window_component) {
   switch (window_component) {
     case HTBOTTOM:
       return aura::kCursorSouthResize;
@@ skipping 49 matching lines @@
                                                 aura::MouseEvent* event) {
   // We must always update the cursor, otherwise the cursor can get stuck if an
   // event filter registered with us consumes the event.
   if (event->type() == ui::ET_MOUSE_MOVED)
     UpdateCursor(target, event);
 
   if (FilterMouseEvent(target, event))
     return true;
 
   if (event->type() == ui::ET_MOUSE_PRESSED)
-    target->GetFocusManager()->SetFocusedWindow(target);
+    ActivateIfNecessary(target, event);
 
   return false;
 }
 
 ui::TouchStatus RootWindowEventFilter::PreHandleTouchEvent(
     aura::Window* target,
     aura::TouchEvent* event) {
   ui::TouchStatus status = FilterTouchEvent(target, event);
   if (status != ui::TOUCH_STATUS_UNKNOWN)
     return status;
 
   if (event->type() == ui::ET_TOUCH_PRESSED)
-    target->GetFocusManager()->SetFocusedWindow(target);
+    ActivateIfNecessary(target, event);
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindowEventFilter, private:
 
+void RootWindowEventFilter::ActivateIfNecessary(aura::Window* window,
+                                                aura::Event* event) {
+  aura::Window* activatable = StackingController::GetActivatableWindow(window);
+  if (activatable == aura::RootWindow::GetInstance()->active_window()) {
+    // |window| is a descendant of the active window, no need to activate.
+    window->GetFocusManager()->SetFocusedWindow(window);
+  } else {
+    aura::RootWindow::GetInstance()->SetActiveWindow(activatable, window);
+  }
+}
+
 void RootWindowEventFilter::UpdateCursor(aura::Window* target,
                                          aura::MouseEvent* event) {
   gfx::NativeCursor cursor = target->GetCursor(event->location());
   if (event->flags() & ui::EF_IS_NON_CLIENT) {
     int window_component =
         target->delegate()->GetNonClientComponent(event->location());
     cursor = CursorForWindowComponent(window_component);
   }
   aura::RootWindow::GetInstance()->SetCursor(cursor);
 }
@@ skipping 32 matching lines @@
     while (status == ui::TOUCH_STATUS_UNKNOWN &&
         (filter = it.GetNext()) != NULL) {
       status = filter->PreHandleTouchEvent(target, event);
     }
   }
   return status;
 }
 
 }  // namespace internal
 }  // namespace aura_shell