Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView.

ui/views/controls/menu/menu_runner.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/menu/menu_runner.h"
 
 #include <set>
 
 #include "base/metrics/histogram.h"
 #include "ui/base/models/menu_model.h"
@@ skipping 323 matching lines @@
                                             const gfx::Rect& bounds,
                                             MenuItemView::AnchorPosition anchor,
                                             int32 types) {
   // The parent of the nested menu will have created a DisplayChangeListener, so
   // we avoid creating a DisplayChangeListener if nested. Drop menus are
   // transient, so we don't cancel in that case.
   if ((types & (IS_NESTED | FOR_DROP)) == 0 && parent) {
     display_change_listener_.reset(
         internal::DisplayChangeListener::Create(parent, this));
   }
-  if ((types & MenuRunner::CONTEXT_MENU) &&
-      parent &&
-      !MenuItemView::IsBubble(anchor)) {
-    const ui::Event* current_event = parent->GetCurrentEvent();
-    anchor = current_event && current_event->IsMouseEvent() ?
-        MenuItemView::TOPLEFT : MenuItemView::BOTTOMCENTER;
-  }
 
   return holder_->RunMenuAt(parent, button, bounds, anchor, types);
 }
 
+MenuRunner::RunResult MenuRunner::RunContextMenuAt(
+    Widget* parent,
+    MenuButton* button,
+    const gfx::Rect& bounds,
+    ui::ContextMenuSourceType source_type,
+    int32 types) {
+  MenuItemView::AnchorPosition anchor = MenuItemView::TOPLEFT;
+  switch (source_type) {
+    case ui::CONTEXT_MENU_SOURCE_KEYBOARD:
+      break;
+    case ui::CONTEXT_MENU_SOURCE_MOUSE:
+      break;
+    case ui::CONTEXT_MENU_SOURCE_TOUCH:
+      anchor = MenuItemView::BOTTOMCENTER;
+      break;
+    case ui::CONTEXT_MENU_SOURCE_TOUCH_EDITING:
+      anchor = MenuItemView::BOTTOMCENTER;
+      break;
+    default:
+      break;
+  }
+  types |= views::MenuRunner::CONTEXT_MENU;
+  return RunMenuAt(parent, button, bounds, anchor, types);
+}
+
+
 bool MenuRunner::IsRunning() const {
   return holder_->running();
 }
 
 void MenuRunner::Cancel() {
   holder_->Cancel();
 }
 
 base::TimeDelta MenuRunner::closing_event_time() const {
   return holder_->closing_event_time();
 }
 
 }  // namespace views