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, 8 insertions, 5 deletions

diff --git a/chrome/browser/page_menu_model.cc b/chrome/browser/page_menu_model.cc
index bf5912a..992d5c6 100644
--- a/chrome/browser/page_menu_model.cc
+++ b/chrome/browser/page_menu_model.cc
@@ -38,14 +38,16 @@ void PageMenuModel::Build() {
   AddSeparator();
 
   zoom_menu_model_.reset(new ZoomMenuModel(delegate()));
-  AddSubMenuWithStringId(IDS_ZOOM_MENU, zoom_menu_model_.get());
+  AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_ZOOM_MENU, zoom_menu_model_.get());
 
   encoding_menu_model_.reset(new EncodingMenuModel(browser_));
-  AddSubMenuWithStringId(IDS_ENCODING_MENU, encoding_menu_model_.get());
+  AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,
+                         encoding_menu_model_.get());
 
   AddSeparator();
   devtools_menu_model_.reset(new DevToolsMenuModel(delegate()));
-  AddSubMenuWithStringId(IDS_DEVELOPER_MENU, devtools_menu_model_.get());
+  AddSubMenuWithStringId(IDC_DEVELOPER_MENU, IDS_DEVELOPER_MENU,
+                         devtools_menu_model_.get());
 
   AddSeparator();
   AddItemWithStringId(IDC_REPORT_BUG, IDS_REPORT_BUG);
@@ -163,8 +165,9 @@ void PopupPageMenuModel::Build() {
   AddItemWithStringId(IDC_FIND, IDS_FIND);
   AddItemWithStringId(IDC_PRINT, IDS_PRINT);
   zoom_menu_model_.reset(new ZoomMenuModel(delegate()));
-  AddSubMenuWithStringId(IDS_ZOOM_MENU, zoom_menu_model_.get());
+  AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_ZOOM_MENU, zoom_menu_model_.get());
 
   encoding_menu_model_.reset(new EncodingMenuModel(browser_));
-  AddSubMenuWithStringId(IDS_ENCODING_MENU, encoding_menu_model_.get());
+  AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,
+                         encoding_menu_model_.get());
 }