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

ash/shelf/shelf_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 "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/ash_constants.h"
@@ skipping 25 matching lines @@
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 using gfx::Animation;
 using views::View;
@@ skipping 579 matching lines @@
   // Ignore if this is a repost event on the last pressed shelf item.
   int index = view_model_->GetIndexOfView(view);
   if (index == -1)
     return false;
   return !IsRepostEvent(event) || last_pressed_index_ != index;
 }
 
 void ShelfView::PointerPressedOnButton(views::View* view,
                                        Pointer pointer,
                                        const ui::LocatedEvent& event) {
+  if (IsShowingMenu())
+    launcher_menu_runner_->Cancel();
   if (drag_view_)
     return;
 
   int index = view_model_->GetIndexOfView(view);
   if (index == -1 || view_model_->view_size() <= 1)
     return;  // View is being deleted, ignore request.
 
   if (view == GetAppListButton())
     return;  // View is not draggable, ignore request.
 
@@ skipping 994 matching lines @@
     case SHELF_ALIGNMENT_LEFT:
       context_menu_point.SetPoint(shelf_bounds.x() + kShelfSize, point.y());
       break;
     case SHELF_ALIGNMENT_RIGHT:
       context_menu_point.SetPoint(shelf_bounds.right() - kShelfSize, point.y());
       break;
   }
   last_pressed_index_ = -1;
 
   const ShelfItem* item = ShelfItemForView(source);
-  if (!item) {
+  int index = view_model_->GetIndexOfView(source);
+  if (index == 0 || !item) {

[xiyuan, 2017/05/15 19:20:52]

Why we need to include |index| == 0? Can you document it?

[minch1, 2017/05/15 22:16:34]

This is for the launcher icon (the first item in the shelf). The gesture events
of this item will not go through ShelfButton's OnGestureEvent. This will produce
a flash behavior if long press of the item.
I think it is fine to make the context menu of this item the same as if touching
empty space on the shelf. Since the contents of the context menu in these two
situations are the same.

[xiyuan, 2017/05/15 22:41:10]

It is more accurate to check |item| type than the model index since model index
might change in the future e.g. when UX allows launcher button to float.
i.e. item.type == TYPE_APP_LIST

[minch1, 2017/05/16 22:13:38]

Done.

     ShellPort::Get()->ShowContextMenu(context_menu_point, source_type);
     return;
   }
 
   std::unique_ptr<ui::MenuModel> context_menu_model(
       Shell::Get()->shell_delegate()->CreateContextMenu(wm_shelf_, item));
   if (!context_menu_model)
     return;
 
   context_menu_id_ = item ? item->id : ShelfID();
@@ skipping 54 matching lines @@
     }
   } else {
     // Distinguish the touch events that triggered on the bottom or left / right
     // shelf. Since they should have different |MenuAnchorPosition|.
     if (wm_shelf_->IsHorizontalAlignment())
       menu_alignment = views::MENU_ANCHOR_FIXED_BOTTOMCENTER;
     else
       menu_alignment = views::MENU_ANCHOR_FIXED_SIDECENTER;
   }
 
+  // No dragging if shelf is autohide.
+  if (wm_shelf()->auto_hide_behavior() == SHELF_AUTO_HIDE_BEHAVIOR_NEVER)
+    views::MenuController::SetDoCancel(false);
   // NOTE: if you convert to HAS_MNEMONICS be sure to update menu building code.
   launcher_menu_runner_->RunMenuAt(source->GetWidget(), nullptr, anchor,
                                    menu_alignment, source_type);
 }
 
 void ShelfView::OnMenuClosed(views::InkDrop* ink_drop) {
   context_menu_id_ = ShelfID();
 
-  // Hide the hide overflow bubble after showing a context menu for its items.
-  if (owner_overflow_bubble_)
-    owner_overflow_bubble_->Hide();
-
   closing_event_time_ = launcher_menu_runner_->closing_event_time();
 
   if (ink_drop)
     ink_drop->AnimateToState(views::InkDropState::DEACTIVATED);
 
   launcher_menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
   scoped_root_window_for_new_windows_.reset();
 
@@ skipping 66 matching lines @@
   if (pointer == TOUCH &&
       (base::TimeTicks::Now() - touch_press_time_) <
           base::TimeDelta::FromMilliseconds(kTouchDragTimeThresholdMs)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace ash