Replace content::ContextMenuSourceType with ui::MenuSourceType.

chrome/browser/ui/views/tab_contents/render_view_context_menu_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 "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 22 matching lines @@
 
 #if !defined(OS_WIN)
 // static
 RenderViewContextMenuViews* RenderViewContextMenuViews::Create(
     content::WebContents* web_contents,
     const content::ContextMenuParams& params) {
   return new RenderViewContextMenuViews(web_contents, params);
 }
 #endif  // OS_WIN
 
-void RenderViewContextMenuViews::RunMenuAt(
-    views::Widget* parent,
-    const gfx::Point& point,
-    content::ContextMenuSourceType type) {
+void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
+                                           const gfx::Point& point,
+                                           ui::MenuSourceType type) {
   views::MenuItemView::AnchorPosition anchor_position =
-      (type == content::CONTEXT_MENU_SOURCE_TOUCH ||
-          type == content::CONTEXT_MENU_SOURCE_TOUCH_EDIT_MENU) ?
+      (type == ui::MENU_SOURCE_TOUCH ||
+          type == ui::MENU_SOURCE_TOUCH_EDIT_MENU) ?
           views::MenuItemView::BOTTOMCENTER : views::MenuItemView::TOPLEFT;
 
-  // TODO(varunjain): remove this by consolidating ui::MenuSourceType and
-  // content::ContextMenuSourceType.
-  ui::MenuSourceType source_type = ui::MENU_SOURCE_NONE;
-  switch (type) {
-    case content::CONTEXT_MENU_SOURCE_MOUSE:
-      source_type = ui::MENU_SOURCE_MOUSE;
-      break;
-    case content::CONTEXT_MENU_SOURCE_KEYBOARD:
-      source_type = ui::MENU_SOURCE_KEYBOARD;
-      break;
-    case content::CONTEXT_MENU_SOURCE_TOUCH:
-      source_type = ui::MENU_SOURCE_TOUCH;
-      break;
-    default:
-      break;
-  }
   if (menu_runner_->RunMenuAt(parent, NULL, gfx::Rect(point, gfx::Size()),
-      anchor_position, source_type, views::MenuRunner::HAS_MNEMONICS |
+      anchor_position, type, views::MenuRunner::HAS_MNEMONICS |
           views::MenuRunner::CONTEXT_MENU) ==
       views::MenuRunner::MENU_DELETED)
     return;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderViewContextMenuViews, protected:
 
 void RenderViewContextMenuViews::PlatformInit() {
   menu_runner_.reset(new views::MenuRunner(&menu_model_));
@@ skipping 58 matching lines @@
   item->SetEnabled(enabled);
   item->SetTitle(title);
   item->SetVisible(!hidden);
 
   views::MenuItemView* parent = item->GetParentMenuItem();
   if (!parent)
     return;
 
   parent->ChildrenChanged();
 }