Move check for gesture end events out of RootViewTargeter

ui/views/widget/root_view.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/views/widget/root_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 243 matching lines @@
     return;
 
   ui::GestureEvent* gesture_event = event->AsGestureEvent();
 
   // Do not process ui::ET_GESTURE_BEGIN events.
   if (gesture_event->type() == ui::ET_GESTURE_BEGIN) {
     event->SetHandled();
     return;
   }
 
-  // Do not process ui::ET_GESTURE_END events which do not correspond to the
-  // removal of the final touch point.
+  // Do not process ui::ET_GESTURE_END events if they do not correspond to the
+  // removal of the final touch point or if no gesture handler has already
+  // been set.
   if (gesture_event->type() == ui::ET_GESTURE_END &&
-      gesture_event->details().touch_points() > 1) {
+      (gesture_event->details().touch_points() > 1 ||
+       !gesture_handler_)) {
     event->SetHandled();
     return;
   }
 
   // Do not process subsequent gesture scroll events if no handler was set for
   // a ui::ET_GESTURE_SCROLL_BEGIN event.
   if (!gesture_handler_ &&
       (gesture_event->type() == ui::ET_GESTURE_SCROLL_UPDATE ||
        gesture_event->type() == ui::ET_GESTURE_SCROLL_END ||
        gesture_event->type() == ui::ET_SCROLL_FLING_START)) {
@@ skipping 443 matching lines @@
 
 #ifndef NDEBUG
   DCHECK(!event_dispatch_target_ || Contains(event_dispatch_target_));
 #endif
 
   return details;
 }
 
 }  // namespace internal
 }  // namespace views