aura: Move GestureRecognizer from views into aura.

Remove deprecated GestureManager, and move the functional GestureRecognizer from views into aura.

BUG=110227
TEST=views_unittests:GestureEvent, aura_unittests:GestureRecognizerTest

Review URL: https://chromiumcodereview.appspot.com/9255019

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

1 files changed, 10 insertions, 0 deletions

diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index b4dbd2e..8e59c4f 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -40,6 +40,7 @@ class StackingClient;
 class ScrollEvent;
 class TouchEvent;
 class GestureEvent;
+class GestureRecognizer;
 
 // RootWindow is responsible for hosting a set of windows.
 class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
@@ -151,6 +152,11 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   void ToggleFullScreen();
 #endif
 
+  // Provided only for testing:
+  void SetGestureRecognizerForTesting(GestureRecognizer* gr) {
+    gesture_recognizer_ = gr;
+  }
+
   // Overridden from ui::CompositorDelegate:
   virtual void ScheduleDraw() OVERRIDE;
 
@@ -229,6 +235,10 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   Window* mouse_moved_handler_;
   Window* focused_window_;
   Window* touch_event_handler_;
+  Window* gesture_handler_;
+
+  // The gesture_recognizer_ for this.
+  GestureRecognizer* gesture_recognizer_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };