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

ui/views/widget/desktop_aura/desktop_activation_client.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 "ui/views/widget/desktop_aura/desktop_activation_client.h"
 
 #include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/activation_change_observer.h"
@@ skipping 125 matching lines @@
 }
 
 void DesktopActivationClient::OnWindowFocused(aura::Window* window) {
   ActivateWindow(GetActivatableWindow(window));
 }
 
 bool DesktopActivationClient::CanActivateWindow(aura::Window* window) const {
   return window &&
       window->IsVisible() &&
       (!aura::client::GetActivationDelegate(window) ||
-       aura::client::GetActivationDelegate(window)->ShouldActivate());
+       aura::client::GetActivationDelegate(window)->ShouldActivate(NULL));
 }
 
 ui::EventResult DesktopActivationClient::OnKeyEvent(ui::KeyEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
 ui::EventResult DesktopActivationClient::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
     FocusWindowWithEvent(event);
   return ui::ER_UNHANDLED;
@@ skipping 18 matching lines @@
 
 void DesktopActivationClient::FocusWindowWithEvent(const ui::Event* event) {
   aura::Window* window = static_cast<aura::Window*>(event->target());
   if (GetActiveWindow() != window) {
     aura::client::GetFocusClient(window)->FocusWindow(
         FindFocusableWindowFor(window), event);
   }
 }
 
 }  // namespace views