Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView.

ui/views/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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 119 matching lines @@
         }
       }
     }
 
     if (owner_->context_menu_controller() &&
         (event->type() == ui::ET_GESTURE_LONG_PRESS ||
          event->type() == ui::ET_GESTURE_LONG_TAP ||
          event->type() == ui::ET_GESTURE_TWO_FINGER_TAP)) {
       gfx::Point location(event->location());
       View::ConvertPointToScreen(owner_, &location);
-      owner_->ShowContextMenu(location, true);
+      owner_->ShowContextMenu(location, ui::MENU_SOURCE_TOUCH);
       event->StopPropagation();
     }
   }
 
   View* owner_;
   bool touch_dnd_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(PostEventDispatchHandler);
 };
 
@@ skipping 990 matching lines @@
 bool View::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
   return false;
 }
 
 bool View::GetTooltipTextOrigin(const gfx::Point& p, gfx::Point* loc) const {
   return false;
 }
 
 // Context menus ---------------------------------------------------------------
 
-void View::ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture) {
+void View::ShowContextMenu(const gfx::Point& p,
+                           ui::MenuSourceType source_type) {
   if (!context_menu_controller_)
     return;
 
-  context_menu_controller_->ShowContextMenuForView(this, p);
+  context_menu_controller_->ShowContextMenuForView(this, p, source_type);
 }
 
 // static
 bool View::ShouldShowContextMenuOnMousePress() {
   return kContextMenuOnMousePress;
 }
 
 // Drag and drop ---------------------------------------------------------------
 
 bool View::GetDropFormats(
@@ skipping 944 matching lines @@
   if (!enabled)
     return result;
 
   if (event.IsOnlyRightMouseButton() && context_menu_controller &&
       kContextMenuOnMousePress) {
     // Assume that if there is a context menu controller we won't be deleted
     // from mouse pressed.
     gfx::Point location(event.location());
     if (HitTestPoint(location)) {
       ConvertPointToScreen(this, &location);
-      ShowContextMenu(location, true);
+      ShowContextMenu(location, ui::MENU_SOURCE_MOUSE);
       return true;
     }
   }
 
   // WARNING: we may have been deleted, don't use any View variables.
   if (drag_operations != ui::DragDropTypes::DRAG_NONE) {
     drag_info->PossibleDrag(event.location());
     return true;
   }
   return !!context_menu_controller || result;
@@ skipping 22 matching lines @@
 
 void View::ProcessMouseReleased(const ui::MouseEvent& event) {
   if (!kContextMenuOnMousePress && context_menu_controller_ &&
       event.IsOnlyRightMouseButton()) {
     // Assume that if there is a context menu controller we won't be deleted
     // from mouse released.
     gfx::Point location(event.location());
     OnMouseReleased(event);
     if (HitTestPoint(location)) {
       ConvertPointToScreen(this, &location);
-      ShowContextMenu(location, true);
+      ShowContextMenu(location, ui::MENU_SOURCE_MOUSE);
     }
   } else {
     OnMouseReleased(event);
   }
   // WARNING: we may have been deleted.
 }
 
 // Accelerators ----------------------------------------------------------------
 
 void View::RegisterPendingAccelerators() {
@@ skipping 133 matching lines @@
   ConvertPointToWidget(this, &widget_location);
   GetWidget()->RunShellDrag(this, data, widget_location, drag_operations,
       source);
   return true;
 #else
   return false;
 #endif  // !defined(OS_MACOSX)
 }
 
 }  // namespace views