Allow custom context menus to be requested.

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 4382 matching lines @@
 }
 
 bool RenderViewImpl::GetContentStateImmediately() const {
   return send_content_state_immediately_;
 }
 
 float RenderViewImpl::GetFilteredTimePerFrame() const {
   return filtered_time_per_frame();
 }
 
-void RenderViewImpl::ShowContextMenu(WebKit::WebFrame* frame,
-                                     const WebKit::WebContextMenuData& data) {
-  showContextMenu(frame, data);
+int RenderViewImpl::ShowContextMenu(content::ContextMenuClient* client,
+                                    const content::ContextMenuParams& params) {
+  DCHECK(client);  // A null client means "internal" when we issue callbacks.
+  content::ContextMenuParams our_params(params);
+  our_params.custom_context.request_id = pending_context_menus_.Add(client);
+  Send(new ViewHostMsg_ContextMenu(routing_id_, our_params));
+  return our_params.custom_context.request_id;
 }
 
 WebKit::WebPageVisibilityState RenderViewImpl::GetVisibilityState() const {
   return visibilityState();
 }
 
 void RenderViewImpl::RunModalAlertDialog(WebKit::WebFrame* frame,
                                          const WebKit::WebString& message) {
   return runModalAlertDialog(frame, message);
 }
@@ skipping 709 matching lines @@
   webkit_preferences_.Apply(webview());
 }
 
 void RenderViewImpl::OnSetAltErrorPageURL(const GURL& url) {
   alternate_error_page_url_ = url;
 }
 
 void RenderViewImpl::OnCustomContextMenuAction(
     const content::CustomContextMenuContext& custom_context,
     unsigned action) {
-  if (custom_context.is_pepper_menu)
-    pepper_delegate_.OnCustomContextMenuAction(custom_context, action);
-  else
+  if (custom_context.request_id) {
+    // External context menu request, look in our map.
+    content::ContextMenuClient* client =
+        pending_context_menus_.Lookup(custom_context.request_id);
+    if (client)
+      client->OnCustomContextMenuAction(custom_context.request_id, action);
+  } else {
+    // Internal request, forward to WebKit.
     webview()->performCustomContextMenuAction(action);
-  FOR_EACH_OBSERVER(RenderViewObserver, observers_,
-                    ContextMenuAction(action));
+  }
 }
 
 void RenderViewImpl::OnEnumerateDirectoryResponse(
     int id,
     const std::vector<FilePath>& paths) {
   if (!enumeration_completions_[id])
     return;
 
   WebVector<WebString> ws_file_names(paths.size());
   for (size_t i = 0; i < paths.size(); ++i)
@@ skipping 1113 matching lines @@
   if (!external_popup_menu_.get())
     return;
 
   external_popup_menu_->DidSelectItems(canceled, selected_indices);
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderViewImpl::OnContextMenuClosed(
     const content::CustomContextMenuContext& custom_context) {
-  if (custom_context.is_pepper_menu)
-    pepper_delegate_.OnContextMenuClosed(custom_context);
-  else
+  if (custom_context.request_id) {
+    // External request, should be in our map.
+    content::ContextMenuClient* client =
+        pending_context_menus_.Lookup(custom_context.request_id);
+    if (client) {

[jam, 2012/10/10 04:01:43]

nit: why the null check? seems that if this is NULL it's a bug that a crash
would track down

[brettw, 2012/10/10 05:10:17]

Removed, this was leftover from a previous version of the code.

+      client->OnCustomContextMenuClosed(custom_context.request_id);
+      pending_context_menus_.Remove(custom_context.request_id);
+    }
+  } else {
+    // Internal request, forward to WebKit.
     context_menu_node_.reset();
+  }
 }
 
 void RenderViewImpl::OnEnableViewSourceMode() {
   if (!webview())
     return;
   WebFrame* main_frame = webview()->mainFrame();
   if (!main_frame)
     return;
   main_frame->enableViewSourceMode(true);
 }
@@ skipping 25 matching lines @@
 
   updating_frame_tree_ = true;
   active_frame_id_map_.clear();
 
   target_process_id_ = process_id;
   target_routing_id_ = route_id;
   CreateFrameTree(webview()->mainFrame(), frames);
 
   updating_frame_tree_ = false;
 }