<webview>: Context menu API implementation CL.

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 18 matching lines @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/extensions/devtools_util.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/guestview/webview/webview_guest.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/renderer_context_menu/context_menu_content_type_factory.h"
 #include "chrome/browser/renderer_context_menu/spellchecker_submenu_observer.h"
 #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 353 matching lines @@
 RenderViewContextMenu::RenderViewContextMenu(
     content::RenderFrameHost* render_frame_host,
     const content::ContextMenuParams& params)
     : params_(params),
       source_web_contents_(WebContents::FromRenderFrameHost(render_frame_host)),
       render_process_id_(render_frame_host->GetProcess()->GetID()),
       render_frame_id_(render_frame_host->GetRoutingID()),
       profile_(Profile::FromBrowserContext(
           source_web_contents_->GetBrowserContext())),
       menu_model_(this),
-      extension_items_(profile_, this, &menu_model_,
-                    base::Bind(MenuItemMatchesParams, params_)),
+      extension_items_(profile_,
+                       this,
+                       &menu_model_,
+                       base::Bind(MenuItemMatchesParams, params_)),
       speech_input_submenu_model_(this),
       protocol_handler_submenu_model_(this),
       protocol_handler_registry_(
           ProtocolHandlerRegistryFactory::GetForProfile(profile_)),
       command_executed_(false) {
   content_type_.reset(ContextMenuContentTypeFactory::Create(
                           source_web_contents_,
                           render_frame_host, params));
 }
 
@@ skipping 69 matching lines @@
       contexts.Contains(MenuItem::PAGE))
     return true;
 
   return false;
 }
 
 static const GURL& GetDocumentURL(const content::ContextMenuParams& params) {
   return params.frame_url.is_empty() ? params.page_url : params.frame_url;
 }
 
-// static
+// static.

[Fady Samuel, 2014/03/05 17:54:10]

This change seems unnecesary.

[lazyboy, 2014/03/05 18:27:59]

Done.

 bool RenderViewContextMenu::MenuItemMatchesParams(
     const content::ContextMenuParams& params,
     const extensions::MenuItem* item) {
   bool match = ExtensionContextAndPatternMatch(params, item->contexts(),
                                                item->target_url_patterns());
   if (!match)
     return false;
 
   const GURL& document_url = GetDocumentURL(params);
   return ExtensionPatternMatch(item->document_url_patterns(), document_url);
@@ skipping 16 matching lines @@
   // Get a list of extension id's that have context menu items, and sort by the
   // top level context menu title of the extension.
   std::set<std::string> ids = menu_manager->ExtensionIds();
   std::vector<base::string16> sorted_menu_titles;
   std::map<base::string16, std::string> map_ids;
   for (std::set<std::string>::iterator i = ids.begin(); i != ids.end(); ++i) {
     const Extension* extension = service->GetExtensionById(*i, false);
     // Platform apps have their context menus created directly in
     // AppendPlatformAppItems.
     if (extension && !extension->is_platform_app()) {
+      const MenuItem::ExtensionKey& key(*i);
       base::string16 menu_title = extension_items_.GetTopLevelContextMenuTitle(
-          *i, printable_selection_text);
+          key, printable_selection_text);
       map_ids[menu_title] = *i;
       sorted_menu_titles.push_back(menu_title);
     }
   }
   if (sorted_menu_titles.empty())
     return;
 
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   l10n_util::SortStrings16(app_locale, &sorted_menu_titles);
 
   int index = 0;
   base::TimeTicks begin = base::TimeTicks::Now();
   for (size_t i = 0; i < sorted_menu_titles.size(); ++i) {
     const std::string& id = map_ids[sorted_menu_titles[i]];
-    extension_items_.AppendExtensionItems(id, printable_selection_text,
-                                          &index);
+    const MenuItem::ExtensionKey& extension_key = MenuItem::ExtensionKey(id);

[Fady Samuel, 2014/03/05 17:54:10]

This doesn't look right. You're constructing a temporary object and holding a
reference to it. I think that may produce undefined behavior:

MenuItem::ExtensionKey extension_key(id);

is probably what you want.

[lazyboy, 2014/03/05 18:27:59]

Ou, don't know how it got there, fixed, thanks.

+    extension_items_.AppendExtensionItems(
+        extension_key, printable_selection_text, &index);
   }
 
   UMA_HISTOGRAM_TIMES("Extensions.ContextMenus_BuildTime",
                       base::TimeTicks::Now() - begin);
   UMA_HISTOGRAM_COUNTS("Extensions.ContextMenus_ItemCount", index);
 }
 
 void RenderViewContextMenu::AppendCurrentExtensionItems() {
   // Avoid appending extension related items when |extension| is null.
   // For Panel, this happens when the panel is navigated to a url outside of the
   // extension's package.
   const Extension* extension = GetExtension();
   if (extension) {
     // Only add extension items from this extension.
     int index = 0;
-    extension_items_.AppendExtensionItems(extension->id(),
-                                          PrintableSelectionText(), &index);
+    const MenuItem::ExtensionKey key(
+        extension->id(), WebViewGuest::GetViewInstanceId(source_web_contents_));
+    extension_items_.AppendExtensionItems(
+        key, PrintableSelectionText(), &index);
   }
 }
 
 void RenderViewContextMenu::InitMenu() {
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_CUSTOM)) {
     AppendCustomItems();
 
     const bool has_selection = !params_.selection_text.empty();
     if (has_selection) {
       // We will add more items if there's a selection, so add a separator.
@@ skipping 1460 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);
 }