Separate Toolkit specific impl

chrome/browser/renderer_context_menu/render_view_context_menu.cc

 // Copyright 2014 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/renderer_context_menu/render_view_context_menu.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 441 matching lines @@
                           source_web_contents_, params));
 }
 
 RenderViewContextMenu::~RenderViewContextMenu() {
 }
 
 // Menu construction functions -------------------------------------------------
 
 void RenderViewContextMenu::Init() {
   InitMenu();
-  PlatformInit();
+  if (toolkit_delegate_)
+    toolkit_delegate_->Init(&menu_model_);
 }
 
 void RenderViewContextMenu::Cancel() {
-  PlatformCancel();
+  if (toolkit_delegate_)
+    toolkit_delegate_->Cancel();
 }
 
 static bool ExtensionPatternMatch(const extensions::URLPatternSet& patterns,
                                   const GURL& url) {
   // No patterns means no restriction, so that implicitly matches.
   if (patterns.is_empty())
     return true;
   return patterns.MatchesURL(url);
 }
 
@@ skipping 285 matching lines @@
 void RenderViewContextMenu::AddSubMenu(int command_id,
                                        const base::string16& label,
                                        ui::MenuModel* model) {
   menu_model_.AddSubMenu(command_id, label, model);
 }
 
 void RenderViewContextMenu::UpdateMenuItem(int command_id,
                                            bool enabled,
                                            bool hidden,
                                            const base::string16& label) {
-  // This function needs platform-specific implementation.
-  NOTIMPLEMENTED();
+  if (toolkit_delegate_) {
+    toolkit_delegate_->UpdateMenuItem(command_id,

[sky, 2014/07/31 21:23:43]

It seems like you're duplicating some of what MenuModelDelegate was intended
for. How about adding an ItemChanged to MenuModelDelegate and setters to
SimpleMenuModel for what this needs to change? I believe doing that would mean
no ToolkitDelegate.

[oshima, 2014/07/31 22:02:15]

I think it's quite different (partly due to the way RVConextMenu works).

RenderViewContextMenu has its own way to manage and update menu item, in async
way.
Menu's view status are managed in different ways (observers are controlling
views state).

It may be possible to rearchitecut the renderer context menu to use
MenuModelDelegate,
but that'd be huge task and the outside of the scope of this CL. If I'm
misunderstanding
something and there is a simpler way, let me know.

[sky, 2014/07/31 22:19:40]

I don't think it would be that much. If you make MenuModelAdapter a
MenuModelDegate and have RVCM::UpdateMenuItem call through to the delegate than
it'll work. For the cocoa side you could make RenderViewContextMenuCocoa
implement the MenuModelDelegate method. There may be a more central place there.
Not sure.

+                                      enabled,
+                                      hidden,
+                                      label);
+  }
 }
 
 RenderViewHost* RenderViewContextMenu::GetRenderViewHost() const {
   return source_web_contents_->GetRenderViewHost();
 }
 
 WebContents* RenderViewContextMenu::GetWebContents() const {
   return source_web_contents_;
 }
 
@@ skipping 1251 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }