Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView.

ui/views/controls/combobox/native_combobox_views.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/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/events/event.h"
@@ skipping 81 matching lines @@
 NativeComboboxViews::~NativeComboboxViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxViews, View overrides:
 
 bool NativeComboboxViews::OnMousePressed(const ui::MouseEvent& mouse_event) {
   combobox_->RequestFocus();
   if (mouse_event.IsLeftMouseButton()) {
     UpdateFromModel();
-    ShowDropDownMenu();
+    ShowDropDownMenu(ui::MENU_SOURCE_MOUSE);
   }
 
   return true;
 }
 
 bool NativeComboboxViews::OnMouseDragged(const ui::MouseEvent& mouse_event) {
   return true;
 }
 
 bool NativeComboboxViews::OnKeyPressed(const ui::KeyEvent& key_event) {
@@ skipping 61 matching lines @@
 void NativeComboboxViews::OnBlur() {
   NOTREACHED();
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeComboboxViews, ui::EventHandler overrides:
 
 void NativeComboboxViews::OnGestureEvent(ui::GestureEvent* gesture) {
   if (gesture->type() == ui::ET_GESTURE_TAP) {
     UpdateFromModel();
-    ShowDropDownMenu();
+    ShowDropDownMenu(ui::MENU_SOURCE_TOUCH);
     gesture->StopPropagation();
     return;
   }
   View::OnGestureEvent(gesture);
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeComboboxViews, NativeComboboxWrapper overrides:
 
 void NativeComboboxViews::UpdateFromModel() {
@@ skipping 166 matching lines @@
   SkPaint paint;
   // This makes the arrow subtractive.
   if (combobox_->invalid())
     paint.setXfermodeMode(SkXfermode::kDstOut_Mode);
   canvas->DrawImageInt(*disclosure_arrow_, arrow_bounds.x(), arrow_bounds.y(),
                        paint);
 
   canvas->Restore();
 }
 
-void NativeComboboxViews::ShowDropDownMenu() {
+void NativeComboboxViews::ShowDropDownMenu(ui::MenuSourceType source_type) {
 
   if (!dropdown_list_menu_runner_.get())
     UpdateFromModel();
 
   // Extend the menu to the width of the combobox.
   MenuItemView* menu = dropdown_list_menu_runner_->GetMenu();
   SubmenuView* submenu = menu->CreateSubmenu();
   submenu->set_minimum_preferred_width(size().width() -
                                 (kMenuBorderWidthLeft + kMenuBorderWidthRight));
 
   gfx::Rect lb = GetLocalBounds();
   gfx::Point menu_position(lb.origin());
 
   // Inset the menu's requested position so the border of the menu lines up
   // with the border of the combobox.
   menu_position.set_x(menu_position.x() + kMenuBorderWidthLeft);
   menu_position.set_y(menu_position.y() + kMenuBorderWidthTop);
   lb.set_width(lb.width() - (kMenuBorderWidthLeft + kMenuBorderWidthRight));
 
   View::ConvertPointToScreen(this, &menu_position);
   if (menu_position.x() < 0)
       menu_position.set_x(0);
 
   gfx::Rect bounds(menu_position, lb.size());
 
   dropdown_open_ = true;
   if (dropdown_list_menu_runner_->RunMenuAt(
           GetWidget(), NULL, bounds, MenuItemView::TOPLEFT,
-          MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
+          source_type, MenuRunner::HAS_MNEMONICS) ==
+      MenuRunner::MENU_DELETED)
     return;
   dropdown_open_ = 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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWrapper, public:
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views