Shelf context menu should spawn at cursor position for mouse events.

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 1614 matching lines @@
     }
   }
   // The menu clears |scoped_root_window_for_new_windows_| in OnMenuClosed.
   if (!IsShowingMenu())
     scoped_root_window_for_new_windows_.reset();
 }
 
 void ShelfView::ShowContextMenuForView(views::View* source,
                                        const gfx::Point& point,
                                        ui::MenuSourceType source_type) {
-  // Align the context menu to the edge of the shelf.
-  aura::Window* shelf_window = shelf_widget_->GetNativeWindow();
-  gfx::Rect shelf_bounds =
-      is_overflow_mode()
-          ? owner_overflow_bubble_->bubble_view()->GetBubbleBounds()
-          : ScreenUtil::GetDisplayBoundsWithShelf(shelf_window);
+  gfx::Point context_menu_point = point;
+  // Align the context menu to the edge of the shelf for touch events.
+  if (source_type == ui::MenuSourceType::MENU_SOURCE_TOUCH) {
+    aura::Window* shelf_window = shelf_widget_->GetNativeWindow();
+    gfx::Rect shelf_bounds =
+        is_overflow_mode()
+            ? owner_overflow_bubble_->bubble_view()->GetBubbleBounds()
+            : ScreenUtil::GetDisplayBoundsWithShelf(shelf_window);
 
-  gfx::Point context_menu_point;
-  switch (wm_shelf_->GetAlignment()) {
-    case SHELF_ALIGNMENT_BOTTOM:
-    case SHELF_ALIGNMENT_BOTTOM_LOCKED:
-      context_menu_point.SetPoint(point.x(),
-                                  shelf_bounds.bottom() - kShelfSize);
-      break;
-    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;
+    switch (wm_shelf_->GetAlignment()) {
+      case SHELF_ALIGNMENT_BOTTOM:
+      case SHELF_ALIGNMENT_BOTTOM_LOCKED:
+        context_menu_point.SetPoint(point.x(),
+                                    shelf_bounds.bottom() - kShelfSize);
+        break;
+      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) {
     ShellPort::Get()->ShowContextMenu(context_menu_point, source_type);
     return;
   }
 
   std::unique_ptr<ui::MenuModel> context_menu_model(
@@ skipping 157 matching lines @@
   if (pointer == TOUCH &&
       (base::TimeTicks::Now() - touch_press_time_) <
           base::TimeDelta::FromMilliseconds(kTouchDragTimeThresholdMs)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace ash