Revert 170477 - Removes the |event| parameter from ActivationDelegate::ShouldActivate and makes the…

ash/wm/activation_controller.cc

 // Copyright (c) 2012 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 "ash/wm/activation_controller.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/activation_controller_delegate.h"
@@ skipping 93 matching lines @@
 
 // Returns true if |window| can be activated or deactivated.
 // A window manager typically defines some notion of "top level window" that
 // supports activation/deactivation.
 bool CanActivateWindowWithEvent(aura::Window* window,
                                 const ui::Event* event,
                                 ActivateVisibilityType visibility_type) {
   return window &&
       VisibilityMatches(window, visibility_type) &&
       (!aura::client::GetActivationDelegate(window) ||
-        aura::client::GetActivationDelegate(window)->ShouldActivate()) &&
+        aura::client::GetActivationDelegate(window)->ShouldActivate(event)) &&
       SupportsChildActivation(window->parent()) &&
       (BelongsToContainerWithEqualOrGreaterId(
           window, kShellWindowId_SystemModalContainer) ||
        !Shell::GetInstance()->IsSystemModalWindowOpen());
 }
 
 // When a modal window is activated, we bring its entire transient parent chain
 // to the front. This function must be called before the modal transient is
 // stacked at the top to ensure correct stacking order.
 void StackTransientParentsBelowModalWindow(aura::Window* window) {
@@ skipping 296 matching lines @@
   aura::Window* window = static_cast<aura::Window*>(event->target());
   window = delegate_->WillFocusWindow(window);
   if (GetActiveWindow() != window) {
     aura::client::GetFocusClient(window)->FocusWindow(
         FindFocusableWindowFor(window), event);
   }
 }
 
 }  // namespace internal
 }  // namespace ash