Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView.

ui/views/controls/button/button_dropdown.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/button/button_dropdown.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 52 matching lines @@
       IsTriggerableEvent(event) && HitTestPoint(event.location())) {
     // Store the y pos of the mouse coordinates so we can use them later to
     // determine if the user dragged the mouse down (which should pop up the
     // drag down menu immediately, instead of waiting for the timer)
     y_position_on_lbuttondown_ = event.y();
 
     // Schedule a task that will show the menu.
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&ButtonDropDown::ShowDropDownMenu,
-                   show_menu_factory_.GetWeakPtr()),
+                   show_menu_factory_.GetWeakPtr(),
+                   ui::GetMenuSourceTypeForEvent(event)),
         base::TimeDelta::FromMilliseconds(kMenuTimerDelay));
   }
   return ImageButton::OnMousePressed(event);
 }
 
 bool ButtonDropDown::OnMouseDragged(const ui::MouseEvent& event) {
   bool result = ImageButton::OnMouseDragged(event);
 
   if (show_menu_factory_.HasWeakPtrs()) {
     // If the mouse is dragged to a y position lower than where it was when
     // clicked then we should not wait for the menu to appear but show
     // it immediately.
     if (event.y() > y_position_on_lbuttondown_ + GetHorizontalDragThreshold()) {
       show_menu_factory_.InvalidateWeakPtrs();
-      ShowDropDownMenu();
+      ShowDropDownMenu(ui::GetMenuSourceTypeForEvent(event));
     }
   }
 
   return result;
 }
 
 void ButtonDropDown::OnMouseReleased(const ui::MouseEvent& event) {
   if (IsTriggerableEvent(event) ||
       (event.IsRightMouseButton() && !HitTestPoint(event.location()))) {
     ImageButton::OnMouseReleased(event);
@@ skipping 26 matching lines @@
 }
 
 void ButtonDropDown::GetAccessibleState(ui::AccessibleViewState* state) {
   CustomButton::GetAccessibleState(state);
   state->role = ui::AccessibilityTypes::ROLE_BUTTONDROPDOWN;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
   state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
 }
 
 void ButtonDropDown::ShowContextMenuForView(View* source,
-                                            const gfx::Point& point) {
+                                            const gfx::Point& point,
+                                            ui::MenuSourceType source_type) {
   if (!enabled())
     return;
 
   show_menu_factory_.InvalidateWeakPtrs();
-  ShowDropDownMenu();
+  ShowDropDownMenu(source_type);
 }
 
 bool ButtonDropDown::ShouldEnterPushedState(const ui::Event& event) {
   // Enter PUSHED state on press with Left or Right mouse button or on taps.
   // Remain in this state while the context menu is open.
   return event.type() == ui::ET_GESTURE_TAP ||
          event.type() == ui::ET_GESTURE_TAP_DOWN ||
          (event.IsMouseEvent() && ((ui::EF_LEFT_MOUSE_BUTTON |
              ui::EF_RIGHT_MOUSE_BUTTON) & event.flags()) != 0);
 }
 
 bool ButtonDropDown::ShouldShowMenu() {
   return true;
 }
 
-void ButtonDropDown::ShowDropDownMenu() {
+void ButtonDropDown::ShowDropDownMenu(ui::MenuSourceType source_type) {
   if (!ShouldShowMenu())
     return;
 
   gfx::Rect lb = GetLocalBounds();
 
   // Both the menu position and the menu anchor type change if the UI layout
   // is right-to-left.
   gfx::Point menu_position(lb.origin());
   menu_position.Offset(0, lb.height() - 1);
   if (base::i18n::IsRTL())
@@ skipping 17 matching lines @@
 
   // Create and run menu.  Display an empty menu if model is NULL.
   if (model_.get()) {
     MenuModelAdapter menu_delegate(model_.get());
     menu_delegate.set_triggerable_event_flags(triggerable_event_flags());
     menu_runner_.reset(new MenuRunner(menu_delegate.CreateMenu()));
     MenuRunner::RunResult result =
         menu_runner_->RunMenuAt(GetWidget(), NULL,
                                 gfx::Rect(menu_position, gfx::Size(0, 0)),
                                 MenuItemView::TOPLEFT,
+                                source_type,
                                 MenuRunner::HAS_MNEMONICS);
     if (result == MenuRunner::MENU_DELETED)
       return;
   } else {
     MenuDelegate menu_delegate;
     MenuItemView* menu = new MenuItemView(&menu_delegate);
     menu_runner_.reset(new MenuRunner(menu));
     MenuRunner::RunResult result =
         menu_runner_->RunMenuAt(GetWidget(), NULL,
                                 gfx::Rect(menu_position, gfx::Size(0, 0)),
                                 MenuItemView::TOPLEFT,
+                                source_type,
                                 MenuRunner::HAS_MNEMONICS);
     if (result == MenuRunner::MENU_DELETED)
       return;
   }
 
   menu_showing_ = false;
 
   // Need to explicitly clear mouse handler so that events get sent
   // properly after the menu finishes running. If we don't do this, then
   // the first click to other parts of the UI is eaten.
   SetMouseHandler(NULL);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ButtonDropDown - Accessibility
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace views