MacViews: Remove GetMenu() from MenuRunner.

chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc

Index: chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
index b9df373df40af6b095003a70d1ba0b7788691b57..b036173bbf1d91c928651b01ae7ae64c84462eef 100644
--- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
+++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -16,6 +16,7 @@
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 #include "ui/views/controls/menu/menu_item_view.h"
+#include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 using content::WebContents;
@@ -58,8 +59,10 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
 // RenderViewContextMenuViews, protected:
 
 void RenderViewContextMenuViews::PlatformInit() {
+  menu_adapter_.reset(new views::MenuModelAdapter(&menu_model_));
+  menu_view_ = menu_adapter_->CreateMenu();

[sky, 2014/07/15 23:53:00]

I thought RenderViewContextMenuView was one of the places we wanted to use
system menus?

[Andre, 2014/07/16 00:25:16]

This is true, but I'm not sure how to convert
RenderViewContextMenuViews::UpdateMenuItem
to equivalent MenuModel based code.
Additionally, RenderViewContextMenuMac has additional items we will want such as
dictionary
lookup and text-to-speech.
It seems like what we want is to keep using RenderViewContextMenuMac even when
toolkit_views=1.

[sky, 2014/07/16 14:44:37]

This means we're done to the omnibox and textfield needing special handling. I'm
starting to think we should keep the ifdefs in those two places. I say that is
this is a large change that complicates things and doesn't address some other
places that are getting the menu (such as bookmark bar and making some tests).
WDYT?

   menu_runner_.reset(new views::MenuRunner(
-      &menu_model_,
+      menu_view_,
       views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
 }
 
@@ -191,8 +194,7 @@ void RenderViewContextMenuViews::UpdateMenuItem(int command_id,
                                                 bool enabled,
                                                 bool hidden,
                                                 const base::string16& title) {
-  views::MenuItemView* item =
-      menu_runner_->GetMenu()->GetMenuItemByID(command_id);
+  views::MenuItemView* item = menu_view_->GetMenuItemByID(command_id);
   if (!item)
     return;