aura: Fix setting touch-handler and gesture-handler.

ui/aura/root_window.cc

Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index f79d4e0ad07a6315e038b8941a6d741462de02ee..79ffdf14f7cb94ea5709f5261b0df1974410119b 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -216,7 +216,8 @@ bool RootWindow::DispatchTouchEvent(TouchEvent* event) {
   if (target) {
     TouchEvent translated_event(*event, this, target);
     status = ProcessTouchEvent(target, &translated_event);
-    if (status == ui::TOUCH_STATUS_START)
+    if (status == ui::TOUCH_STATUS_START ||
+        status == ui::TOUCH_STATUS_QUEUED)
       touch_event_handler_ = target;
     else if (status == ui::TOUCH_STATUS_END ||
              status == ui::TOUCH_STATUS_CANCEL)
@@ -392,8 +393,11 @@ void RootWindow::ReleaseCapture(Window* window) {
 
 void RootWindow::AdvanceQueuedTouchEvent(Window* window, bool processed) {
   scoped_ptr<GestureRecognizer::Gestures> gestures;
+  Window* old_gesture_handler = gesture_handler_;
+  gesture_handler_ = window;
   gestures.reset(gesture_recognizer_->AdvanceTouchQueue(window, processed));
   ProcessGestures(gestures.get());
+  gesture_handler_ = old_gesture_handler;
 }
 
 void RootWindow::SetGestureRecognizerForTesting(GestureRecognizer* gr) {