Make shelf item can be dragged when context menu is opened.

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"
@@ skipping 62 matching lines @@
   }
 
   MenuController* menu_controller_;
   SubmenuView* submenu_;
   aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(PreMenuEventDispatchHandler);
 };
 #endif  // OS_MACOSX
 
+#if !defined(OS_MACOSX)
+void TransferGesture(Widget* source, Widget* target) {

[msw, 2017/05/17 23:03:30]

nit: comment, maybe seek menu review from sky@?

+  ui::GestureRecognizer::Get()->TransferEventsTo(
+      source->GetNativeView(), target->GetNativeView(),
+      ui::GestureRecognizer::ShouldCancelTouches::DontCancel);
+}
+#endif
+
 }  // namespace internal
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuHost, public:
 
 MenuHost::MenuHost(SubmenuView* submenu)
     : submenu_(submenu),
       destroying_(false),
       ignore_capture_lost_(false) {
   set_auto_release_capture(false);
@@ skipping 25 matching lines @@
   // 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()));
+  owner_ = parent;
 #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
   // process of showing.
   base::AutoReset<bool> reseter(&ignore_capture_lost_, true);
   ShowInactive();
   if (do_capture) {
     // Cancel existing touches, so we don't miss some touch release/cancel

[msw, 2017/05/17 23:03:30]

nit: move comment into else?

[minch1, 2017/05/26 23:01:12]

Done.

     // events due to the menu taking capture.
+#if !defined(OS_MACOSX)
+    MenuController* menu_controller =
+        submenu_->GetMenuItem()->GetMenuController();
+    if (menu_controller) {
+      if (menu_controller->owner_needs_gesture_events()) {
+        // TransferGesture when owner needs gesture events so that the incoming
+        // touch events after MenuHost is created are properly translated into
+        // gesture events instead of being dropped.
+        internal::TransferGesture(owner_, this);
+      } else {
+        ui::GestureRecognizer::Get()->CancelActiveTouchesExcept(nullptr);
+      }
+    }
+#else
     ui::GestureRecognizer::Get()->CancelActiveTouchesExcept(nullptr);
+#endif
     native_widget_private()->SetCapture();
   }
 }
 
 void MenuHost::HideMenuHost() {
+#if !defined(OS_MACOSX)
+  MenuController* menu_controller =
+      submenu_->GetMenuItem()->GetMenuController();
+  if (owner_ && menu_controller &&
+      menu_controller->owner_needs_gesture_events()) {
+    internal::TransferGesture(this, owner_);
+    owner_ = nullptr;
+  }
+#endif
   ignore_capture_lost_ = true;
   ReleaseMenuHostCapture();
   Hide();
   ignore_capture_lost_ = false;
 }
 
 void MenuHost::DestroyMenuHost() {
   HideMenuHost();
   destroying_ = true;
   static_cast<MenuHostRootView*>(GetRootView())->ClearSubmenu();
@@ skipping 77 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