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

ui/aura/client/activation_delegate.h

Index: ui/aura/client/activation_delegate.h
===================================================================
--- ui/aura/client/activation_delegate.h	(revision 170548)
+++ ui/aura/client/activation_delegate.h	(working copy)
@@ -19,8 +19,11 @@
 // to a window's activation state.
 class AURA_EXPORT ActivationDelegate {
  public:
-  // Returns true if the window should be activated.
-  virtual bool ShouldActivate() const = 0;
+  // Returns true if the window should be activated. |event| is either the mouse
+  // event supplied if the activation is the result of a mouse, or the touch
+  // event if the activation is the result of a touch, or NULL if activation is
+  // attempted for another reason.
+  virtual bool ShouldActivate(const ui::Event* event) = 0;
 
   // Sent when the window is activated.
   virtual void OnActivated() = 0;