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

Unified Diff: chrome/browser/extensions/platform_app_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
Index: chrome/browser/extensions/platform_app_browsertest.cc
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc
index 3e9551a6215742962f98b259a2d9ade941f1695b..ae8089d4ba0f555c7bc11ceaf4a742b405ddd941 100644
--- a/chrome/browser/extensions/platform_app_browsertest.cc
+++ b/chrome/browser/extensions/platform_app_browsertest.cc
@@ -151,8 +151,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, EmptyContextMenu) {
// only include the developer tools.
WebContents* web_contents = GetFirstShellWindowWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
scoped_ptr<PlatformAppContextMenu> menu;
menu.reset(new PlatformAppContextMenu(web_contents, params));
menu->Init();
@@ -176,8 +175,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenu) {
// separator and the developer tools, is all that should be in the menu.
WebContents* web_contents = GetFirstShellWindowWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
scoped_ptr<PlatformAppContextMenu> menu;
menu.reset(new PlatformAppContextMenu(web_contents, params));
menu->Init();
@@ -204,8 +202,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, InstalledAppWithContextMenu) {
// these are all that should be in the menu.
WebContents* web_contents = GetFirstShellWindowWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
scoped_ptr<PlatformAppContextMenu> menu;
menu.reset(new PlatformAppContextMenu(web_contents, params));
menu->Init();
@@ -232,8 +229,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenuTextField) {
// separator and the developer tools, is all that should be in the menu.
WebContents* web_contents = GetFirstShellWindowWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
params.is_editable = true;
scoped_ptr<PlatformAppContextMenu> menu;
menu.reset(new PlatformAppContextMenu(web_contents, params));
@@ -261,8 +257,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenuSelection) {
// separator and the developer tools, is all that should be in the menu.
WebContents* web_contents = GetFirstShellWindowWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
params.selection_text = ASCIIToUTF16("Hello World");
scoped_ptr<PlatformAppContextMenu> menu;
menu.reset(new PlatformAppContextMenu(web_contents, params));
@@ -289,8 +284,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenuClicked) {
// Test that the menu item shows up
WebContents* web_contents = GetFirstShellWindowWebContents();
ASSERT_TRUE(web_contents);
- WebKit::WebContextMenuData data;
- content::ContextMenuParams params(data);
+ content::ContextMenuParams params;
params.page_url = GURL("http://foo.bar");
scoped_ptr<PlatformAppContextMenu> menu;
menu.reset(new PlatformAppContextMenu(web_contents, params));

Powered by Google App Engine
This is Rietveld 408576698