Revert 170550 - Revert 170477 - Removes the |event| parameter from ActivationDelegate::ShouldActiva…

content/browser/renderer_host/render_widget_host_view_aura.h

Index: content/browser/renderer_host/render_widget_host_view_aura.h
===================================================================
--- content/browser/renderer_host/render_widget_host_view_aura.h	(revision 170570)
+++ content/browser/renderer_host/render_widget_host_view_aura.h	(working copy)
@@ -200,7 +200,7 @@
   virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Overridden from aura::client::ActivationDelegate:
-  virtual bool ShouldActivate(const ui::Event* event) OVERRIDE;
+  virtual bool ShouldActivate() const OVERRIDE;
   virtual void OnActivated() OVERRIDE;
   virtual void OnLostActive() OVERRIDE;
 
@@ -422,6 +422,10 @@
   };
   CanLockCompositorState can_lock_compositor_;
 
+  // Whether or not the ui::Event* being processed currently would cause
+  // |window_| to be activated.
+  bool pointer_activate_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };