Revert r229753 "Gesture recognizer must be a singleton accross all aura::RootWindows"

Breaks windows bots on chromium.webkit.
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder/builds/44634

TBR=varunjain

Review URL: https://codereview.chromium.org/30813003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229761 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 3 deletions

diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index 7c84fa7..b8c4455 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -208,6 +208,13 @@ class AURA_EXPORT RootWindow : public Window,
                            Window* window,
                            ui::EventResult result);
 
+  ui::GestureRecognizer* gesture_recognizer() const {
+    return gesture_recognizer_.get();
+  }
+
+  // Provided only for testing:
+  void SetGestureRecognizerForTesting(ui::GestureRecognizer* gr);
+
   // Returns the accelerated widget from the RootWindowHost.
   gfx::AcceleratedWidget GetAcceleratedWidget();
 
@@ -311,9 +318,8 @@ class AURA_EXPORT RootWindow : public Window,
   virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE;
 
   // Overridden from ui::GestureEventHelper.
-  virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE;
-  virtual void DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE;
-  virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
+  virtual bool DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
 
   // Overridden from ui::LayerAnimationObserver:
   virtual void OnLayerAnimationEnded(
@@ -380,6 +386,9 @@ class AURA_EXPORT RootWindow : public Window,
   Window* mouse_moved_handler_;
   Window* event_dispatch_target_;
 
+  // The gesture_recognizer_ for this.
+  scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
+
   bool synthesize_mouse_move_;
   bool waiting_on_compositing_end_;
   bool draw_on_compositing_end_;