Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Unified Diff: chrome/browser/ui/panels/panel_extension_browsertest.cc

Issue 15049004: Move ContextMenuParams(WebContextMenuInfo) ctor to content/renderer/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: class -> struct Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/platform_app_browsertest.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_extension_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_extension_browsertest.cc b/chrome/browser/ui/panels/panel_extension_browsertest.cc
index 4644f498948bbe91db834274a1d8ee9b8dbab2d9..8a0457341010ccc97fe38881293cce05f2463361 100644
--- a/chrome/browser/ui/panels/panel_extension_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_extension_browsertest.cc
@@ -152,13 +152,11 @@ IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) {
content::WebContents* web_contents = panel->GetWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
-
// 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(data);
+ 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));
@@ -178,7 +176,7 @@ IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) {
// Verify expected menu contents for editable item.
{
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
params.is_editable = true;
params.page_url = web_contents->GetURL();
// Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
@@ -199,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) {
// Verify expected menu contents for text selection.
{
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
params.page_url = web_contents->GetURL();
params.selection_text = ASCIIToUTF16("Select me");
// Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
@@ -220,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) {
// Verify expected menu contexts for a link.
{
- content::ContextMenuParams params(data);
+ 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).
@@ -257,8 +255,7 @@ IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, CustomContextMenu) {
content::WebContents* web_contents = panel->GetWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
params.page_url = web_contents->GetURL();
// Ensure context menu isn't swallowed by WebContentsDelegate (the panel).
« no previous file with comments | « chrome/browser/extensions/platform_app_browsertest.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698