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

ui/views/controls/menu/menu_controller.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_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 813 matching lines @@
     // current menu is unset. Make sure the submenu remains open by sending the
     // appropriate SetSelectionTypes flags.
     SetSelection(part.menu->GetParentMenuItem(),
         SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
     event->StopPropagation();
   }
 
   if (event->stopped_propagation())
       return;
 
-  if (!part.submenu)
+  if (part.submenu) {
+    part.submenu->OnGestureEvent(event);
     return;
-  part.submenu->OnGestureEvent(event);
+  }
+
+#if !defined(OS_MACOSX)
+  if (send_gesture_events_to_owner()) {

[sadrul, 2017/08/30 20:31:39]

This should happen at the very beginning?

[minch1, 2017/08/31 23:21:02]

Removed to the entry of OnGestureEvent, then we can have a quick return if we
need to send gesture events back to the owner.

+    event->ConvertLocationToTarget(source->GetWidget()->GetNativeWindow(),
+                                   owner()->GetNativeWindow());
+    owner()->OnGestureEvent(event);
+    // Reset |send_gesture_events_to_owner_| when the first gesture ends.
+    if (event->type() == ui::ET_GESTURE_END)
+      send_gesture_events_to_owner_ = false;
+  }
+#endif  // !defined(OS_MACOSX)
 }
 
 void MenuController::OnTouchEvent(SubmenuView* source, ui::TouchEvent* event) {
   if (event->type() == ui::ET_TOUCH_PRESSED) {
     MenuPart part = GetMenuPart(source, event->location());
     if (part.type == MenuPart::NONE) {
       RepostEventAndCancel(source, event);
       event->SetHandled();
     }
   }
@@ skipping 532 matching lines @@
 #endif
 
     default:
       break;
   }
 }
 
 MenuController::MenuController(bool blocking,
                                internal::MenuControllerDelegate* delegate)
     : blocking_run_(blocking),
-      showing_(false),
-      exit_type_(EXIT_NONE),
-      did_capture_(false),
-      result_(NULL),
-      accept_event_flags_(0),
-      drop_target_(NULL),
-      drop_position_(MenuDelegate::DROP_UNKNOWN),
-      owner_(NULL),
-      possible_drag_(false),
-      drag_in_progress_(false),
-      did_initiate_drag_(false),
-      valid_drop_coordinates_(false),
-      last_drop_operation_(MenuDelegate::DROP_UNKNOWN),
-      showing_submenu_(false),
       active_mouse_view_tracker_(base::MakeUnique<ViewTracker>()),
-      hot_button_(nullptr),
-      delegate_(delegate),
-      is_combobox_(false),
-      item_selected_by_touch_(false),
-      current_mouse_event_target_(nullptr),
-      current_mouse_pressed_state_(0) {
+      delegate_(delegate) {
   delegate_stack_.push_back(delegate_);
   active_instance_ = this;
 }
 
 MenuController::~MenuController() {
   DCHECK(!showing_);
   if (owner_)
     owner_->RemoveObserver(this);
   if (active_instance_ == this)
     active_instance_ = NULL;
@@ skipping 1290 matching lines @@
   if (hot_button_)
     hot_button_->SetHotTracked(false);
   hot_button_ = hot_button;
   if (hot_button) {
     hot_button->SetHotTracked(true);
     hot_button->NotifyAccessibilityEvent(ui::AX_EVENT_SELECTION, true);
   }
 }
 
 }  // namespace views