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

ui/aura/root_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/root_window.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 198 matching lines @@
   bool handled = false;
   Window* target =
       touch_event_handler_ ? touch_event_handler_ : capture_window_;
   if (!target)
     target = GetEventHandlerForPoint(event->location());
 
   ui::TouchStatus status = ui::TOUCH_STATUS_UNKNOWN;
   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)
       touch_event_handler_ = NULL;
     handled = status != ui::TOUCH_STATUS_UNKNOWN;
 
     if (status == ui::TOUCH_STATUS_QUEUED)
       gesture_recognizer_->QueueTouchEventForGesture(target, *event);
   }
 
@@ skipping 155 matching lines @@
 }
 
 void RootWindow::ReleaseCapture(Window* window) {
   if (capture_window_ != window)
     return;
   SetCapture(NULL);
 }
 
 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) {
   gesture_recognizer_.reset(gr);
 }
 
 #if !defined(NDEBUG)
 void RootWindow::ToggleFullScreen() {
   host_->ToggleFullScreen();
 }
@@ skipping 357 matching lines @@
   // is currently broken. See/ crbug.com/107931.
   MouseEvent event(ui::ET_MOUSE_MOVED,
                    orig_mouse_location,
                    orig_mouse_location,
                    0);
   DispatchMouseEvent(&event);
 #endif
 }
 
 }  // namespace aura