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("about:blank"), PageTransition::TYPED); | |
642 | |
643 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); | |
644 TabContentsWrapper* tab_wrapper = browser()->GetSelectedTabContentsWrapper(); | |
645 | |
646 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | |
Ben Goodger (Google)
2011/08/24 18:21:49
Can you add a test for exiting fullscreen mode usi
koz (OOO until 15th September)
2011/08/24 21:39:33
Done.
| |
647 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
648 | |
649 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
650 AddTabAtIndex(1, GURL("about:blank"), PageTransition::TYPED); | |
651 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
652 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
653 } | |
654 | |
638 // Chromeos defaults to restoring the last session, so this test isn't | 655 // Chromeos defaults to restoring the last session, so this test isn't |
639 // applicable. | 656 // applicable. |
640 #if !defined(OS_CHROMEOS) | 657 #if !defined(OS_CHROMEOS) |
641 #if defined(OS_MACOSX) | 658 #if defined(OS_MACOSX) |
642 // Crashy, http://crbug.com/38522 | 659 // Crashy, http://crbug.com/38522 |
643 #define RestorePinnedTabs DISABLED_RestorePinnedTabs | 660 #define RestorePinnedTabs DISABLED_RestorePinnedTabs |
644 #endif | 661 #endif |
645 // Makes sure pinned tabs are restored correctly on start. | 662 // Makes sure pinned tabs are restored correctly on start. |
646 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { | 663 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { |
647 ASSERT_TRUE(test_server()->Start()); | 664 ASSERT_TRUE(test_server()->Start()); |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
862 | 879 |
863 // The normal browser should now have four. | 880 // The normal browser should now have four. |
864 EXPECT_EQ(4, browser()->tab_count()); | 881 EXPECT_EQ(4, browser()->tab_count()); |
865 | 882 |
866 // Close the additional browsers. | 883 // Close the additional browsers. |
867 popup_browser->CloseAllTabs(); | 884 popup_browser->CloseAllTabs(); |
868 app_browser->CloseAllTabs(); | 885 app_browser->CloseAllTabs(); |
869 app_popup_browser->CloseAllTabs(); | 886 app_popup_browser->CloseAllTabs(); |
870 } | 887 } |
871 #endif | 888 #endif |
OLD | NEW |