| 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 50165a1710d68971ebb90e5b935b377e93d79a05..636ee305a463e099b79fa2c63f17ca94aa99fc41 100644
|
| --- a/chrome/browser/extensions/platform_app_browsertest.cc
|
| +++ b/chrome/browser/extensions/platform_app_browsertest.cc
|
| @@ -169,6 +169,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, EmptyContextMenu) {
|
| menu.reset(new PlatformAppContextMenu(web_contents, params));
|
| menu->Init();
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
|
| + ASSERT_TRUE(
|
| + menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_RELOAD));
|
| ASSERT_FALSE(menu->HasCommandWithId(IDC_BACK));
|
| ASSERT_FALSE(menu->HasCommandWithId(IDC_SAVE_PAGE));
|
| @@ -194,12 +196,42 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenu) {
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + 1));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
|
| + ASSERT_TRUE(
|
| + menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_RELOAD));
|
| ASSERT_FALSE(menu->HasCommandWithId(IDC_BACK));
|
| ASSERT_FALSE(menu->HasCommandWithId(IDC_SAVE_PAGE));
|
| ASSERT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, InstalledAppWithContextMenu) {
|
| + ExtensionTestMessageListener launched_listener("Launched", false);
|
| + InstallAndLaunchPlatformApp("context_menu");
|
| +
|
| + // Wait for the extension to tell us it's initialized its context menus and
|
| + // launched a window.
|
| + ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
|
| +
|
| + // The context_menu app has two context menu items. For an installed app
|
| + // these are all that should be in the menu.
|
| + WebContents* web_contents = GetFirstShellWindowWebContents();
|
| + ASSERT_TRUE(web_contents);
|
| + WebKit::WebContextMenuData data;
|
| + content::ContextMenuParams params(data);
|
| + scoped_ptr<PlatformAppContextMenu> menu;
|
| + menu.reset(new PlatformAppContextMenu(web_contents, params));
|
| + menu->Init();
|
| + ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST));
|
| + ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + 1));
|
| + ASSERT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
|
| + ASSERT_FALSE(
|
| + menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE));
|
| + ASSERT_FALSE(menu->HasCommandWithId(IDC_RELOAD));
|
| + ASSERT_FALSE(menu->HasCommandWithId(IDC_BACK));
|
| + ASSERT_FALSE(menu->HasCommandWithId(IDC_SAVE_PAGE));
|
| + ASSERT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenuTextField) {
|
| ExtensionTestMessageListener launched_listener("Launched", false);
|
| LoadAndLaunchPlatformApp("context_menu");
|
| @@ -220,6 +252,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenuTextField) {
|
| menu->Init();
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
|
| + ASSERT_TRUE(
|
| + menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_RELOAD));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPY));
|
| @@ -247,6 +281,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenuSelection) {
|
| menu->Init();
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
|
| + ASSERT_TRUE(
|
| + menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_RELOAD));
|
| ASSERT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_UNDO));
|
| ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPY));
|
|
|