Don't send touch events to windows like menus when the touch occurs outside the menu bounds.

ui/views/controls/menu/menu_host.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/controls/menu/menu_host.h"
 
 #include "base/auto_reset.h"
+#include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
+#include "ui/aura/window_observer.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/gfx/path.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_host_root_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/round_rect_painter.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
 
+#if !defined(OS_MACOSX)
+#include "ui/aura/window.h"
+#endif
+
 namespace views {
 
+namespace internal {
+
+#if !defined(OS_MACOSX)
+// This class adds itself as the pre target handler for the |window|
+// passed in. It currently handles touch events and forwards them to the
+// controller. Reason for this approach is views does not get raw touch
+// events which we need to determine if a touch happened outside the bounds
+// of the menu.
+class PreMenuEventDispatchHandler : public ui::EventHandler,
+                                    aura::WindowObserver {
+ public:
+  PreMenuEventDispatchHandler(const MenuController* controller,
+                              SubmenuView* submenu,
+                              aura::Window* window)
+      : menu_controller_(const_cast<MenuController*>(controller)),
+        submenu_(submenu),
+        window_(window) {
+    window_->AddPreTargetHandler(this);
+    window_->AddObserver(this);
+  }
+
+  ~PreMenuEventDispatchHandler() override {
+    StopObserving();
+  }
+
+  // ui::EventHandler overrides.
+  void OnTouchEvent(ui::TouchEvent* event) override {
+    menu_controller_->OnTouchEvent(submenu_, event);
+  }
+
+  // aura::WindowObserver overrides.
+  void OnWindowDestroying(aura::Window* window) override {
+    DCHECK(window_ == window);
+    StopObserving();
+  }
+
+ private:
+  void StopObserving() {
+    if (!window_)
+      return;
+    window_->RemovePreTargetHandler(this);
+    window_->RemoveObserver(this);
+    window_ = nullptr;
+  }
+
+  MenuController* menu_controller_;
+  SubmenuView* submenu_;
+  aura::Window* window_;
+
+  DISALLOW_COPY_AND_ASSIGN(PreMenuEventDispatchHandler);
+};
+#endif  // OS_MACOSX
+
+}  // namespace internal
+
 ////////////////////////////////////////////////////////////////////////////////
 // MenuHost, public:
 
 MenuHost::MenuHost(SubmenuView* submenu)
     : submenu_(submenu),
       destroying_(false),
       ignore_capture_lost_(false) {
   set_auto_release_capture(false);
 }
 
@@ skipping 20 matching lines @@
   params.parent = parent ? parent->GetNativeView() : NULL;
   params.bounds = bounds;
 #if defined(OS_WIN)
   // On Windows use the software compositor to ensure that we don't block
   // the UI thread blocking issue during command buffer creation. We can
   // revert this change once http://crbug.com/125248 is fixed.
   params.force_software_compositing = true;
 #endif
   Init(params);
 
+#if !defined(OS_MACOSX)
+  pre_dispatch_handler_.reset(new internal::PreMenuEventDispatchHandler(
+      menu_controller, submenu_, GetNativeView()));
+#endif
+
   SetContentsView(contents_view);
   ShowMenuHost(do_capture);
 }
 
 bool MenuHost::IsMenuHostVisible() {
   return IsVisible();
 }
 
 void MenuHost::ShowMenuHost(bool do_capture) {
   // Doing a capture may make us get capture lost. Ignore it while we're in the
@@ skipping 12 matching lines @@
   ignore_capture_lost_ = true;
   ReleaseMenuHostCapture();
   Hide();
   ignore_capture_lost_ = false;
 }
 
 void MenuHost::DestroyMenuHost() {
   HideMenuHost();
   destroying_ = true;
   static_cast<MenuHostRootView*>(GetRootView())->ClearSubmenu();
+#if !defined(OS_MACOSX)
+  pre_dispatch_handler_.reset();
+#endif
   Close();
 }
 
 void MenuHost::SetMenuHostBounds(const gfx::Rect& bounds) {
   SetBounds(bounds);
 }
 
 void MenuHost::ReleaseMenuHostCapture() {
   if (native_widget_private()->HasCapture())
     native_widget_private()->ReleaseCapture();
@@ skipping 60 matching lines @@
   }
   menu_controller->OnDragComplete(should_close);
 
   // We may have lost capture in the drag and drop, but are remaining open.
   // Return capture so we get MouseCaptureLost events.
   if (!should_close)
     native_widget_private()->SetCapture();
 }
 
 }  // namespace views