touch: Return an enum from OnTouchEvent.

views/widget/root_view.cc

 // Copyright (c) 2010 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 "views/widget/root_view.h"
 
 #include <algorithm>
 
 #include "app/drag_drop_types.h"
 #include "base/logging.h"
@@ skipping 269 matching lines @@
     }
 
     if (child == drag_view_)
       drag_view_ = NULL;
 
     if (default_keyboard_handler_ == child) {
       default_keyboard_handler_ = NULL;
     }
 
 #if defined(TOUCH_UI)
-    if (touch_pressed_handler_) {
+    if (touch_pressed_handler_ == child) {
       touch_pressed_handler_ = NULL;
     }
 #endif
 
     FocusManager* focus_manager = widget_->GetFocusManager();
     // An unparanted RootView does not have a FocusManager.
     if (focus_manager)
       focus_manager->ViewRemoved(parent, child);
 
     ViewStorage::GetInstance()->ViewRemoved(parent, child);
@@ skipping 39 matching lines @@
     //
     // NOTE: Don't return true here, because we don't want the frame to
     // forward future events to us when there's no handler.
     if (!touch_pressed_handler_)
       break;
 
     // If the view handled the event, leave touch_pressed_handler_ set and
     // return true, which will cause subsequent drag/release events to get
     // forwarded to that view.
     if (handled) {
+      touch_pressed_handler_->set_touch_event_observer(this);
       gesture_manager_->ProcessTouchEventForGesture(e, this, handled);
       return true;
     }
   }
 
   // Reset touch_pressed_handler_ to indicate that no processing is occurring.
   touch_pressed_handler_ = NULL;
 
   // Give the touch event to the gesture manager.
   gesture_manager_->ProcessTouchEventForGesture(e, this, handled);
   return handled;
 }
-#endif
+
+void RootView::OnTouchSequenceEnd() {
+  DCHECK(touch_pressed_handler_);
+  touch_pressed_handler_ = NULL;
+}
+
+#endif  // defined(TOUCH_UI)
 
 bool RootView::OnMousePressed(const MouseEvent& e) {
   // This function does not normally handle non-client messages except for
   // non-client double-clicks. Actually, all double-clicks are special as the
   // are formed from a single-click followed by a double-click event. When the
   // double-click event lands on a different view than its single-click part,
   // we transform it into a single-click which prevents odd things.
   if ((e.GetFlags() & MouseEvent::EF_IS_NON_CLIENT) &&
       !(e.GetFlags() & MouseEvent::EF_IS_DOUBLE_CLICK)) {
     last_click_handler_ = NULL;
@@ skipping 412 matching lines @@
 #elif defined(OS_LINUX)
   gfx::NativeView native_view =
       static_cast<WidgetGtk*>(GetWidget())->window_contents();
   if (!native_view)
     return;
   gdk_window_set_cursor(native_view->window, cursor);
 #endif
 }
 
 }  // namespace views