OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/sys_info.h" | 9 #include "base/sys_info.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 ui_test_utils::NavigateToURL( | 628 ui_test_utils::NavigateToURL( |
629 browser(), GURL(test_server()->GetURL("files/french_page.html"))); | 629 browser(), GURL(test_server()->GetURL("files/french_page.html"))); |
630 fr_language_detected_signal.Wait(); | 630 fr_language_detected_signal.Wait(); |
631 lang.clear(); | 631 lang.clear(); |
632 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( | 632 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( |
633 source.map_key(), &lang)); | 633 source.map_key(), &lang)); |
634 EXPECT_EQ("fr", lang); | 634 EXPECT_EQ("fr", lang); |
635 EXPECT_EQ("fr", helper->language_state().original_language()); | 635 EXPECT_EQ("fr", helper->language_state().original_language()); |
636 } | 636 } |
637 | 637 |
| 638 IN_PROC_BROWSER_TEST_F(BrowserTest, TestToggleFullscreenModeForTab) { |
| 639 ASSERT_TRUE(test_server()->Start()); |
| 640 |
| 641 AddTabAtIndex(0, GURL(test_server()->GetURL("files/fullscreen_test.html")), |
| 642 PageTransition::TYPED); |
| 643 |
| 644 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); |
| 645 |
| 646 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); |
| 647 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 648 AddTabAtIndex(1, GURL("about:blank"), PageTransition::TYPED); |
| 649 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 650 } |
| 651 |
638 // Chromeos defaults to restoring the last session, so this test isn't | 652 // Chromeos defaults to restoring the last session, so this test isn't |
639 // applicable. | 653 // applicable. |
640 #if !defined(OS_CHROMEOS) | 654 #if !defined(OS_CHROMEOS) |
641 #if defined(OS_MACOSX) | 655 #if defined(OS_MACOSX) |
642 // Crashy, http://crbug.com/38522 | 656 // Crashy, http://crbug.com/38522 |
643 #define RestorePinnedTabs DISABLED_RestorePinnedTabs | 657 #define RestorePinnedTabs DISABLED_RestorePinnedTabs |
644 #endif | 658 #endif |
645 // Makes sure pinned tabs are restored correctly on start. | 659 // Makes sure pinned tabs are restored correctly on start. |
646 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { | 660 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { |
647 ASSERT_TRUE(test_server()->Start()); | 661 ASSERT_TRUE(test_server()->Start()); |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
862 | 876 |
863 // The normal browser should now have four. | 877 // The normal browser should now have four. |
864 EXPECT_EQ(4, browser()->tab_count()); | 878 EXPECT_EQ(4, browser()->tab_count()); |
865 | 879 |
866 // Close the additional browsers. | 880 // Close the additional browsers. |
867 popup_browser->CloseAllTabs(); | 881 popup_browser->CloseAllTabs(); |
868 app_browser->CloseAllTabs(); | 882 app_browser->CloseAllTabs(); |
869 app_popup_browser->CloseAllTabs(); | 883 app_popup_browser->CloseAllTabs(); |
870 } | 884 } |
871 #endif | 885 #endif |
OLD | NEW |