Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView.

chrome/browser/ui/views/browser_action_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 "chrome/browser/ui/views/browser_action_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
@@ skipping 157 matching lines @@
 void BrowserActionButton::GetAccessibleState(ui::AccessibleViewState* state) {
   views::MenuButton::GetAccessibleState(state);
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
 }
 
 void BrowserActionButton::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   delegate_->OnBrowserActionExecuted(this);
 }
 
-void BrowserActionButton::ShowContextMenuForView(View* source,
-                                                 const gfx::Point& point) {
+void BrowserActionButton::ShowContextMenuForView(
+    View* source,
+    const gfx::Point& point,
+    ui::MenuSourceType source_type) {
   if (!extension()->ShowConfigureContextMenus())
     return;
 
   SetButtonPushed();
 
   // Reconstructs the menu every time because the menu's contents are dynamic.
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents_(
       new ExtensionContextMenuModel(extension(), browser_, delegate_));
   menu_runner_.reset(new views::MenuRunner(context_menu_contents_.get()));
 
   context_menu_ = menu_runner_->GetMenu();
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(this, &screen_loc);
   if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(screen_loc, size()),
-          views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS |
-          views::MenuRunner::CONTEXT_MENU) ==
+          views::MenuItemView::TOPLEFT, source_type,
+          views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
       views::MenuRunner::MENU_DELETED) {
     return;
   }
 
   menu_runner_.reset();
   SetButtonNotPushed();
   context_menu_ = NULL;
 }
 
 void BrowserActionButton::UpdateState() {
@@ skipping 103 matching lines @@
 bool BrowserActionButton::OnMousePressed(const ui::MouseEvent& event) {
   if (!event.IsRightMouseButton()) {
     return IsPopup() ? MenuButton::OnMousePressed(event) :
                        TextButton::OnMousePressed(event);
   }
 
   if (!views::View::ShouldShowContextMenuOnMousePress()) {
     // See comments in MenuButton::Activate() as to why this is needed.
     SetMouseHandler(NULL);
 
-    ShowContextMenu(gfx::Point(), true);
+    ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
   }
   return false;
 }
 
 void BrowserActionButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (IsPopup() || context_menu_) {
     // TODO(erikkay) this never actually gets called (probably because of the
     // loss of focus).
     MenuButton::OnMouseReleased(event);
   } else {
@@ skipping 73 matching lines @@
   extensions::Command browser_action_command;
   if (!only_if_active || !command_service->GetBrowserActionCommand(
           extension_->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action_command,
           NULL)) {
     GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
     keybinding_.reset(NULL);
   }
 }