| 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, TestNewTabExitsFullscreen) { |
| 639 ASSERT_TRUE(test_server()->Start()); |
| 640 |
| 641 AddTabAtIndex(0, GURL("about:blank"), PageTransition::TYPED); |
| 642 |
| 643 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); |
| 644 |
| 645 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); |
| 646 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); |
| 647 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 648 AddTabAtIndex(1, GURL("about:blank"), PageTransition::TYPED); |
| 649 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); |
| 650 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 651 } |
| 652 |
| 653 IN_PROC_BROWSER_TEST_F(BrowserTest, TestTabExitsItselfFromFullscreen) { |
| 654 ASSERT_TRUE(test_server()->Start()); |
| 655 |
| 656 AddTabAtIndex(0, GURL("about:blank"), PageTransition::TYPED); |
| 657 |
| 658 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); |
| 659 |
| 660 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); |
| 661 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); |
| 662 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 663 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false); |
| 664 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); |
| 665 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 666 } |
| 667 |
| 638 // Chromeos defaults to restoring the last session, so this test isn't | 668 // Chromeos defaults to restoring the last session, so this test isn't |
| 639 // applicable. | 669 // applicable. |
| 640 #if !defined(OS_CHROMEOS) | 670 #if !defined(OS_CHROMEOS) |
| 641 #if defined(OS_MACOSX) | 671 #if defined(OS_MACOSX) |
| 642 // Crashy, http://crbug.com/38522 | 672 // Crashy, http://crbug.com/38522 |
| 643 #define RestorePinnedTabs DISABLED_RestorePinnedTabs | 673 #define RestorePinnedTabs DISABLED_RestorePinnedTabs |
| 644 #endif | 674 #endif |
| 645 // Makes sure pinned tabs are restored correctly on start. | 675 // Makes sure pinned tabs are restored correctly on start. |
| 646 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { | 676 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { |
| 647 ASSERT_TRUE(test_server()->Start()); | 677 ASSERT_TRUE(test_server()->Start()); |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 862 | 892 |
| 863 // The normal browser should now have four. | 893 // The normal browser should now have four. |
| 864 EXPECT_EQ(4, browser()->tab_count()); | 894 EXPECT_EQ(4, browser()->tab_count()); |
| 865 | 895 |
| 866 // Close the additional browsers. | 896 // Close the additional browsers. |
| 867 popup_browser->CloseAllTabs(); | 897 popup_browser->CloseAllTabs(); |
| 868 app_browser->CloseAllTabs(); | 898 app_browser->CloseAllTabs(); |
| 869 app_popup_browser->CloseAllTabs(); | 899 app_popup_browser->CloseAllTabs(); |
| 870 } | 900 } |
| 871 #endif | 901 #endif |
| OLD | NEW |