Pepper/Flapper: First pass at context menu implementation.

chrome/renderer/render_view.cc

 // Copyright (c) 2011 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 551 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(page_info_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(accessibility_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(translate_helper_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
       devtools_client_(NULL),
       geolocation_dispatcher_(NULL),
       speech_input_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
       accessibility_ack_pending_(false),
       pending_app_icon_requests_(0),
-      session_storage_namespace_id_(session_storage_namespace_id) {
+      session_storage_namespace_id_(session_storage_namespace_id),
+      has_saved_context_menu_action_(false),
+      saved_context_menu_action_(0) {
 #if defined(OS_MACOSX)
   // On Mac, the select popups are rendered by the browser.
   // Note that we don't do this in RenderMain otherwise this would not be called
   // in single-process mode.
   WebKit::WebView::setUseExternalPopupMenus(true);
 #endif
 
   ClearBlockedContentSettings();
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClientSidePhishingDetection)) {
@@ skipping 4122 matching lines @@
 
 void RenderView::OnUpdateWebPreferences(const WebPreferences& prefs) {
   webkit_preferences_ = prefs;
   webkit_preferences_.Apply(webview());
 }
 
 void RenderView::OnSetAltErrorPageURL(const GURL& url) {
   alternate_error_page_url_ = url;
 }
 
-void RenderView::OnCustomContextMenuAction(unsigned action) {
-  webview()->performCustomContextMenuAction(action);
+void RenderView::OnCustomContextMenuAction(
+    const webkit_glue::CustomContextMenuContext& custom_context,
+    unsigned action) {
+  if (custom_context.is_pepper_menu) {
+    // Just save the action.
+    DCHECK(!has_saved_context_menu_action_);
+    has_saved_context_menu_action_ = true;

[brettw, 2011/01/29 00:56:52]

It would be nice if this was on the PepperPluginDelegate so that we could avoid
adding more state to the RenderView.

[viettrungluu, 2011/01/29 21:49:14]

Done. I just have the RenderView bounce things over to the PepperPluginDelegate
for Pepper menus.

+    saved_context_menu_action_ = action;
+  } else {
+    webview()->performCustomContextMenuAction(action);
+  }
 }
 
 void RenderView::OnTranslatePage(int page_id,
                                  const std::string& translate_script,
                                  const std::string& source_lang,
                                  const std::string& target_lang) {
   translate_helper_.TranslatePage(page_id, source_lang, target_lang,
                                   translate_script);
 }
 
@@ skipping 1036 matching lines @@
 #endif
 
 void RenderView::OnJavaScriptStressTestControl(int cmd, int param) {
   if (cmd == kJavaScriptStressTestSetStressRunType) {
     v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param));
   } else if (cmd == kJavaScriptStressTestPrepareStressRun) {
     v8::Testing::PrepareStressRun(param);
   }
 }
 
-void RenderView::OnContextMenuClosed() {
-  context_menu_node_.reset();
+void RenderView::OnContextMenuClosed(
+    const webkit_glue::CustomContextMenuContext& custom_context) {
+  if (custom_context.is_pepper_menu) {
+    pepper_delegate_.CompleteShowContextMenu(custom_context.request_id,
+                                             has_saved_context_menu_action_,
+                                             saved_context_menu_action_);
+    has_saved_context_menu_action_ = false;
+    saved_context_menu_action_ = 0;
+  } else {
+    context_menu_node_.reset();
+  }
 }