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 <list> | 5 #include <list> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 browser()->profile())->extension_service(); | 535 browser()->profile())->extension_service(); |
536 const extensions::Extension* extension = | 536 const extensions::Extension* extension = |
537 service->GetExtensionById(last_loaded_extension_id(), false); | 537 service->GetExtensionById(last_loaded_extension_id(), false); |
538 GURL url = extension->GetResourceURL("userAction/a.html"); | 538 GURL url = extension->GetResourceURL("userAction/a.html"); |
539 | 539 |
540 ui_test_utils::NavigateToURL(browser(), url); | 540 ui_test_utils::NavigateToURL(browser(), url); |
541 | 541 |
542 // This corresponds to "Open link in new tab". | 542 // This corresponds to "Open link in new tab". |
543 content::ContextMenuParams params; | 543 content::ContextMenuParams params; |
544 params.is_editable = false; | 544 params.is_editable = false; |
545 params.media_type = WebKit::WebContextMenuData::MediaTypeNone; | 545 params.media_type = blink::WebContextMenuData::MediaTypeNone; |
546 params.page_url = url; | 546 params.page_url = url; |
547 params.frame_id = WebNavigationTabObserver::Get(tab)-> | 547 params.frame_id = WebNavigationTabObserver::Get(tab)-> |
548 frame_navigation_state().GetMainFrameID().frame_num; | 548 frame_navigation_state().GetMainFrameID().frame_num; |
549 params.link_url = extension->GetResourceURL("userAction/b.html"); | 549 params.link_url = extension->GetResourceURL("userAction/b.html"); |
550 | 550 |
551 TestRenderViewContextMenu menu(tab, params); | 551 TestRenderViewContextMenu menu(tab, params); |
552 menu.Init(); | 552 menu.Init(); |
553 menu.ExecuteCommand(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB, 0); | 553 menu.ExecuteCommand(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB, 0); |
554 | 554 |
555 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 555 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
(...skipping 19 matching lines...) Expand all Loading... |
575 | 575 |
576 ExtensionService* service = extensions::ExtensionSystem::Get( | 576 ExtensionService* service = extensions::ExtensionSystem::Get( |
577 browser()->profile())->extension_service(); | 577 browser()->profile())->extension_service(); |
578 const extensions::Extension* extension = | 578 const extensions::Extension* extension = |
579 service->GetExtensionById(last_loaded_extension_id(), false); | 579 service->GetExtensionById(last_loaded_extension_id(), false); |
580 GURL url = extension->GetResourceURL("requestOpenTab/a.html"); | 580 GURL url = extension->GetResourceURL("requestOpenTab/a.html"); |
581 | 581 |
582 ui_test_utils::NavigateToURL(browser(), url); | 582 ui_test_utils::NavigateToURL(browser(), url); |
583 | 583 |
584 // There's a link on a.html. Middle-click on it to open it in a new tab. | 584 // There's a link on a.html. Middle-click on it to open it in a new tab. |
585 WebKit::WebMouseEvent mouse_event; | 585 blink::WebMouseEvent mouse_event; |
586 mouse_event.type = WebKit::WebInputEvent::MouseDown; | 586 mouse_event.type = blink::WebInputEvent::MouseDown; |
587 mouse_event.button = WebKit::WebMouseEvent::ButtonMiddle; | 587 mouse_event.button = blink::WebMouseEvent::ButtonMiddle; |
588 mouse_event.x = 7; | 588 mouse_event.x = 7; |
589 mouse_event.y = 7; | 589 mouse_event.y = 7; |
590 mouse_event.clickCount = 1; | 590 mouse_event.clickCount = 1; |
591 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 591 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
592 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 592 mouse_event.type = blink::WebInputEvent::MouseUp; |
593 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 593 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
594 | 594 |
595 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 595 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
596 } | 596 } |
597 | 597 |
598 // Fails often on Windows dbg bots. http://crbug.com/177163 | 598 // Fails often on Windows dbg bots. http://crbug.com/177163 |
599 #if defined(OS_WIN) && !defined(NDEBUG) | 599 #if defined(OS_WIN) && !defined(NDEBUG) |
600 #define MAYBE_TargetBlank DISABLED_TargetBlank | 600 #define MAYBE_TargetBlank DISABLED_TargetBlank |
601 #else | 601 #else |
602 #define MAYBE_TargetBlank TargetBlank | 602 #define MAYBE_TargetBlank TargetBlank |
(...skipping 11 matching lines...) Expand all Loading... |
614 ResultCatcher catcher; | 614 ResultCatcher catcher; |
615 | 615 |
616 GURL url = embedded_test_server()->GetURL( | 616 GURL url = embedded_test_server()->GetURL( |
617 "/extensions/api_test/webnavigation/targetBlank/a.html"); | 617 "/extensions/api_test/webnavigation/targetBlank/a.html"); |
618 | 618 |
619 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); | 619 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); |
620 ui_test_utils::NavigateToURL(¶ms); | 620 ui_test_utils::NavigateToURL(¶ms); |
621 | 621 |
622 // There's a link with target=_blank on a.html. Click on it to open it in a | 622 // There's a link with target=_blank on a.html. Click on it to open it in a |
623 // new tab. | 623 // new tab. |
624 WebKit::WebMouseEvent mouse_event; | 624 blink::WebMouseEvent mouse_event; |
625 mouse_event.type = WebKit::WebInputEvent::MouseDown; | 625 mouse_event.type = blink::WebInputEvent::MouseDown; |
626 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; | 626 mouse_event.button = blink::WebMouseEvent::ButtonLeft; |
627 mouse_event.x = 7; | 627 mouse_event.x = 7; |
628 mouse_event.y = 7; | 628 mouse_event.y = 7; |
629 mouse_event.clickCount = 1; | 629 mouse_event.clickCount = 1; |
630 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 630 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
631 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 631 mouse_event.type = blink::WebInputEvent::MouseUp; |
632 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 632 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
633 | 633 |
634 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 634 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
635 } | 635 } |
636 | 636 |
637 // http://crbug.com/177163 | 637 // http://crbug.com/177163 |
638 #if defined(OS_WIN) && !defined(NDEBUG) | 638 #if defined(OS_WIN) && !defined(NDEBUG) |
639 #define MAYBE_TargetBlankIncognito DISABLED_TargetBlankIncognito | 639 #define MAYBE_TargetBlankIncognito DISABLED_TargetBlankIncognito |
640 #else | 640 #else |
641 #define MAYBE_TargetBlankIncognito TargetBlankIncognito | 641 #define MAYBE_TargetBlankIncognito TargetBlankIncognito |
(...skipping 10 matching lines...) Expand all Loading... |
652 | 652 |
653 GURL url = embedded_test_server()->GetURL( | 653 GURL url = embedded_test_server()->GetURL( |
654 "/extensions/api_test/webnavigation/targetBlank/a.html"); | 654 "/extensions/api_test/webnavigation/targetBlank/a.html"); |
655 | 655 |
656 Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord( | 656 Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord( |
657 browser()->profile(), url); | 657 browser()->profile(), url); |
658 WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents(); | 658 WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents(); |
659 | 659 |
660 // There's a link with target=_blank on a.html. Click on it to open it in a | 660 // There's a link with target=_blank on a.html. Click on it to open it in a |
661 // new tab. | 661 // new tab. |
662 WebKit::WebMouseEvent mouse_event; | 662 blink::WebMouseEvent mouse_event; |
663 mouse_event.type = WebKit::WebInputEvent::MouseDown; | 663 mouse_event.type = blink::WebInputEvent::MouseDown; |
664 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; | 664 mouse_event.button = blink::WebMouseEvent::ButtonLeft; |
665 mouse_event.x = 7; | 665 mouse_event.x = 7; |
666 mouse_event.y = 7; | 666 mouse_event.y = 7; |
667 mouse_event.clickCount = 1; | 667 mouse_event.clickCount = 1; |
668 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 668 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
669 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 669 mouse_event.type = blink::WebInputEvent::MouseUp; |
670 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); | 670 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); |
671 | 671 |
672 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 672 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
673 } | 673 } |
674 | 674 |
675 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { | 675 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) { |
676 ASSERT_TRUE(StartEmbeddedTestServer()); | 676 ASSERT_TRUE(StartEmbeddedTestServer()); |
677 ASSERT_TRUE( | 677 ASSERT_TRUE( |
678 RunExtensionSubtest("webnavigation", "test_history.html")) | 678 RunExtensionSubtest("webnavigation", "test_history.html")) |
679 << message_; | 679 << message_; |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
800 url = GURL(base::StringPrintf( | 800 url = GURL(base::StringPrintf( |
801 "http://www.a.com:%d/" | 801 "http://www.a.com:%d/" |
802 "extensions/api_test/webnavigation/crash/b.html", | 802 "extensions/api_test/webnavigation/crash/b.html", |
803 embedded_test_server()->port())); | 803 embedded_test_server()->port())); |
804 ui_test_utils::NavigateToURL(browser(), url); | 804 ui_test_utils::NavigateToURL(browser(), url); |
805 | 805 |
806 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 806 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
807 } | 807 } |
808 | 808 |
809 } // namespace extensions | 809 } // namespace extensions |
OLD | NEW |