| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/app/chrome_command_ids.h" | 5 #include "chrome/app/chrome_command_ids.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/extensions/extension_webnavigation_api.h" | 8 #include "chrome/browser/extensions/extension_webnavigation_api.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/tab_contents/render_view_context_menu.h" | 10 #include "chrome/browser/tab_contents/render_view_context_menu.h" |
| 11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_list.h" | 12 #include "chrome/browser/ui/browser_list.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "content/browser/renderer_host/render_view_host.h" | 15 #include "content/browser/renderer_host/render_view_host.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/common/context_menu_params.h" |
| 17 #include "net/base/mock_host_resolver.h" | 18 #include "net/base/mock_host_resolver.h" |
| 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" |
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 20 #include "webkit/glue/context_menu.h" | |
| 21 | 21 |
| 22 using content::WebContents; | 22 using content::WebContents; |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 class TestRenderViewContextMenu : public RenderViewContextMenu { | 26 class TestRenderViewContextMenu : public RenderViewContextMenu { |
| 27 public: | 27 public: |
| 28 TestRenderViewContextMenu(WebContents* web_contents, | 28 TestRenderViewContextMenu(WebContents* web_contents, |
| 29 const ContextMenuParams& params) | 29 const content::ContextMenuParams& params) |
| 30 : RenderViewContextMenu(web_contents, params) { | 30 : RenderViewContextMenu(web_contents, params) { |
| 31 } | 31 } |
| 32 virtual ~TestRenderViewContextMenu() {} | 32 virtual ~TestRenderViewContextMenu() {} |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 virtual void PlatformInit() {} | 35 virtual void PlatformInit() {} |
| 36 virtual bool GetAcceleratorForCommandId(int, ui::Accelerator*) { | 36 virtual bool GetAcceleratorForCommandId(int, ui::Accelerator*) { |
| 37 return false; | 37 return false; |
| 38 } | 38 } |
| 39 | 39 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 ResultCatcher catcher; | 164 ResultCatcher catcher; |
| 165 | 165 |
| 166 ExtensionService* service = browser()->profile()->GetExtensionService(); | 166 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 167 const Extension* extension = | 167 const Extension* extension = |
| 168 service->GetExtensionById(last_loaded_extension_id_, false); | 168 service->GetExtensionById(last_loaded_extension_id_, false); |
| 169 GURL url = extension->GetResourceURL("userAction/a.html"); | 169 GURL url = extension->GetResourceURL("userAction/a.html"); |
| 170 | 170 |
| 171 ui_test_utils::NavigateToURL(browser(), url); | 171 ui_test_utils::NavigateToURL(browser(), url); |
| 172 | 172 |
| 173 // This corresponds to "Open link in new tab". | 173 // This corresponds to "Open link in new tab". |
| 174 ContextMenuParams params; | 174 content::ContextMenuParams params; |
| 175 params.is_editable = false; | 175 params.is_editable = false; |
| 176 params.media_type = WebKit::WebContextMenuData::MediaTypeNone; | 176 params.media_type = WebKit::WebContextMenuData::MediaTypeNone; |
| 177 params.page_url = url; | 177 params.page_url = url; |
| 178 params.frame_id = | 178 params.frame_id = |
| 179 ExtensionWebNavigationTabObserver::Get(tab)-> | 179 ExtensionWebNavigationTabObserver::Get(tab)-> |
| 180 frame_navigation_state().GetMainFrameID(); | 180 frame_navigation_state().GetMainFrameID(); |
| 181 params.link_url = extension->GetResourceURL("userAction/b.html"); | 181 params.link_url = extension->GetResourceURL("userAction/b.html"); |
| 182 | 182 |
| 183 TestRenderViewContextMenu menu(tab, params); | 183 TestRenderViewContextMenu menu(tab, params); |
| 184 menu.Init(); | 184 menu.Init(); |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; | 288 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; |
| 289 mouse_event.x = 7; | 289 mouse_event.x = 7; |
| 290 mouse_event.y = 7; | 290 mouse_event.y = 7; |
| 291 mouse_event.clickCount = 1; | 291 mouse_event.clickCount = 1; |
| 292 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 292 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
| 293 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 293 mouse_event.type = WebKit::WebInputEvent::MouseUp; |
| 294 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 294 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
| 295 | 295 |
| 296 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 296 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 297 } | 297 } |
| OLD | NEW |