Re-organize RenderViewContextMenu to the use cross-platform MenuModel class.

Benefits:
- less code
- more straightforward code
- more shared code

unresolved issues:
- RenderViewContextMenu{Gtk,Mac,Views} should not be a subclass of RenderViewContextMenu
- On Linux, IMEs are added in the wrong place (not near the other editable stuff)

BUG=31365
TEST=manual + trybots

Review URL: http://codereview.chromium.org/2017001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46987 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index c0c537d..0833a6c 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "chrome/browser/tab_contents/provisional_load_details.h"
-#include "chrome/browser/views/tab_contents/render_view_context_menu_external_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu_views.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
 #include "chrome/common/bindings_policy.h"
@@ -152,8 +152,6 @@ bool ExternalTabContainer::Init(Profile* profile,
 
   ::ShowWindow(tab_contents_->GetNativeView(), SW_SHOWNA);
 
-  disabled_context_menu_ids_.push_back(
-      IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD);
   LoadAccelerators();
   SetupExternalTabView();
   return true;
@@ -519,9 +517,8 @@ bool ExternalTabContainer::HandleContextMenu(const ContextMenuParams& params) {
   }
 
   external_context_menu_.reset(
-      new RenderViewContextMenuExternalWin(tab_contents(),
-                                           params,
-                                           disabled_context_menu_ids_));
+      new RenderViewContextMenuViews(tab_contents(), params));
+  external_context_menu_->SetExternal();
   external_context_menu_->Init();
 
   POINT screen_pt = { params.x, params.y };