Context Menu Refactor

chrome/browser/ui/panels/panel_extension_browsertest.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 135 matching lines @@
   content::WebContents* web_contents = panel->GetWebContents();
   ASSERT_TRUE(web_contents);
 
   // Verify basic menu contents. The basic extension does not add any
   // context menu items so the panel's menu should include only the
   // developer tools.
   {
     content::ContextMenuParams params;
     params.page_url = web_contents->GetURL();
     // Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
-    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(params));
+    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(
+        web_contents->GetRenderWidgetHostView(), params));
 
     std::unique_ptr<PanelContextMenu> menu(
         new PanelContextMenu(web_contents->GetMainFrame(), params));
     menu->Init();
 
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_PASTE));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPY));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_BACK));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_SAVE_PAGE));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION));
   }
 
   // Verify expected menu contents for editable item.
   {
     content::ContextMenuParams params;
     params.is_editable = true;
     params.page_url = web_contents->GetURL();
     // Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
-    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(params));
+    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(
+        web_contents->GetRenderWidgetHostView(), params));
 
     std::unique_ptr<PanelContextMenu> menu(
         new PanelContextMenu(web_contents->GetMainFrame(), params));
     menu->Init();
 
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
     EXPECT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
     EXPECT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_PASTE));
     EXPECT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPY));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_BACK));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_SAVE_PAGE));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION));
   }
 
   // Verify expected menu contents for text selection.
   {
     content::ContextMenuParams params;
     params.page_url = web_contents->GetURL();
     params.selection_text = base::ASCIIToUTF16("Select me");
     // Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
-    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(params));
+    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(
+        web_contents->GetRenderWidgetHostView(), params));
 
     std::unique_ptr<PanelContextMenu> menu(
         new PanelContextMenu(web_contents->GetMainFrame(), params));
     menu->Init();
 
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_PASTE));
     EXPECT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPY));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_BACK));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_SAVE_PAGE));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION));
   }
 
   // Verify expected menu contexts for a link.
   {
     content::ContextMenuParams params;
     params.page_url = web_contents->GetURL();
     params.unfiltered_link_url = GURL("http://google.com/");
     // Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
-    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(params));
+    EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(
+        web_contents->GetRenderWidgetHostView(), params));
 
     std::unique_ptr<PanelContextMenu> menu(
         new PanelContextMenu(web_contents->GetMainFrame(), params));
     menu->Init();
 
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_PASTE));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPY));
     EXPECT_FALSE(menu->HasCommandWithId(IDC_BACK));
@@ skipping 16 matching lines @@
   PanelManager* panel_manager = PanelManager::GetInstance();
   EXPECT_EQ(1, panel_manager->num_panels());
   Panel* panel = panel_manager->panels().front();
   content::WebContents* web_contents = panel->GetWebContents();
   ASSERT_TRUE(web_contents);
 
   content::ContextMenuParams params;
   params.page_url = web_contents->GetURL();
 
   // Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
-  EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(params));
+  EXPECT_FALSE(web_contents->GetDelegate()->HandleContextMenu(
+      web_contents->GetRenderWidgetHostView(), params));
 
   // Verify menu contents contains the custom item added by their own extension.
   std::unique_ptr<PanelContextMenu> menu;
   menu.reset(new PanelContextMenu(web_contents->GetMainFrame(), params));
   menu->Init();
   EXPECT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + 1));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_PASTE));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPY));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_BACK));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_SAVE_PAGE));
   EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION));
 
   // Execute the extension's custom menu item and wait for the extension's
   // script to tell us its onclick fired.
   ExtensionTestMessageListener onclick_listener("clicked", false);
   int command_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST;
   ASSERT_TRUE(menu->IsCommandIdEnabled(command_id));
   menu->ExecuteCommand(command_id, 0);
   EXPECT_TRUE(onclick_listener.WaitUntilSatisfied());
 }