| 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 #if defined(OS_MACOSX) | 9 #if defined(OS_MACOSX) |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 ui_test_utils::NavigateToURL( | 798 ui_test_utils::NavigateToURL( |
| 799 browser(), GURL(test_server()->GetURL("files/french_page.html"))); | 799 browser(), GURL(test_server()->GetURL("files/french_page.html"))); |
| 800 fr_language_detected_signal.Wait(); | 800 fr_language_detected_signal.Wait(); |
| 801 lang.clear(); | 801 lang.clear(); |
| 802 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( | 802 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( |
| 803 source.map_key(), &lang)); | 803 source.map_key(), &lang)); |
| 804 EXPECT_EQ("fr", lang); | 804 EXPECT_EQ("fr", lang); |
| 805 EXPECT_EQ("fr", helper->language_state().original_language()); | 805 EXPECT_EQ("fr", helper->language_state().original_language()); |
| 806 } | 806 } |
| 807 | 807 |
| 808 IN_PROC_BROWSER_TEST_F(BrowserTest, TestNewTabExitsFullscreen) { | 808 #if defined(OS_MACOSX) |
| 809 // http://crbug.com/100467 |
| 810 #define MAYBE_TestNewTabExitsFullscreen FAILS_TestNewTabExitsFullscreen |
| 811 #else |
| 812 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen |
| 813 #endif |
| 814 |
| 815 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestNewTabExitsFullscreen) { |
| 809 ASSERT_TRUE(test_server()->Start()); | 816 ASSERT_TRUE(test_server()->Start()); |
| 810 | 817 |
| 811 AddTabAtIndex( | 818 AddTabAtIndex( |
| 812 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 819 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 813 | 820 |
| 814 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); | 821 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); |
| 815 | 822 |
| 816 { | 823 { |
| 817 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 824 ui_test_utils::WindowedNotificationObserver fullscreen_observer( |
| 818 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | 825 chrome::NOTIFICATION_FULLSCREEN_CHANGED, |
| 819 NotificationService::AllSources()); | 826 NotificationService::AllSources()); |
| 820 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | 827 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); |
| 821 fullscreen_observer.Wait(); | 828 fullscreen_observer.Wait(); |
| 822 ASSERT_TRUE(browser()->window()->IsFullscreen()); | 829 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 823 } | 830 } |
| 824 | 831 |
| 825 { | 832 { |
| 826 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 833 ui_test_utils::WindowedNotificationObserver fullscreen_observer( |
| 827 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | 834 chrome::NOTIFICATION_FULLSCREEN_CHANGED, |
| 828 NotificationService::AllSources()); | 835 NotificationService::AllSources()); |
| 829 AddTabAtIndex( | 836 AddTabAtIndex( |
| 830 1, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 837 1, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 831 fullscreen_observer.Wait(); | 838 fullscreen_observer.Wait(); |
| 832 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 839 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 833 } | 840 } |
| 834 } | 841 } |
| 835 | 842 |
| 836 IN_PROC_BROWSER_TEST_F(BrowserTest, TestTabExitsItselfFromFullscreen) { | 843 #if defined(OS_MACOSX) |
| 844 // http://crbug.com/100467 |
| 845 #define MAYBE_TestTabExitsItselfFromFullscreen \ |
| 846 FAILS_TestTabExitsItselfFromFullscreen |
| 847 #else |
| 848 #define MAYBE_TestTabExitsItselfFromFullscreen TestTabExitsItselfFromFullscreen |
| 849 #endif |
| 850 |
| 851 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestTabExitsItselfFromFullscreen) { |
| 837 ASSERT_TRUE(test_server()->Start()); | 852 ASSERT_TRUE(test_server()->Start()); |
| 838 | 853 |
| 839 AddTabAtIndex( | 854 AddTabAtIndex( |
| 840 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 855 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 841 | 856 |
| 842 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); | 857 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); |
| 843 | 858 |
| 844 { | 859 { |
| 845 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 860 ui_test_utils::WindowedNotificationObserver fullscreen_observer( |
| 846 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | 861 chrome::NOTIFICATION_FULLSCREEN_CHANGED, |
| 847 NotificationService::AllSources()); | 862 NotificationService::AllSources()); |
| 848 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | 863 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); |
| 849 fullscreen_observer.Wait(); | 864 fullscreen_observer.Wait(); |
| 850 ASSERT_TRUE(browser()->window()->IsFullscreen()); | 865 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 851 } | 866 } |
| 852 | 867 |
| 853 { | 868 { |
| 854 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 869 ui_test_utils::WindowedNotificationObserver fullscreen_observer( |
| 855 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | 870 chrome::NOTIFICATION_FULLSCREEN_CHANGED, |
| 856 NotificationService::AllSources()); | 871 NotificationService::AllSources()); |
| 857 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false); | 872 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false); |
| 858 fullscreen_observer.Wait(); | 873 fullscreen_observer.Wait(); |
| 859 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 874 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 860 } | 875 } |
| 861 } | 876 } |
| 862 | 877 |
| 863 #if defined(OS_MACOSX) | 878 #if defined(OS_MACOSX) |
| 864 IN_PROC_BROWSER_TEST_F(BrowserTest, TabEntersPresentationModeFromWindowed) { | 879 // http://crbug.com/100467 |
| 880 IN_PROC_BROWSER_TEST_F( |
| 881 BrowserTest, FAILS_TabEntersPresentationModeFromWindowed) { |
| 865 ASSERT_TRUE(test_server()->Start()); | 882 ASSERT_TRUE(test_server()->Start()); |
| 866 | 883 |
| 867 AddTabAtIndex( | 884 AddTabAtIndex( |
| 868 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 885 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 869 | 886 |
| 870 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); | 887 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); |
| 871 | 888 |
| 872 { | 889 { |
| 873 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 890 ui_test_utils::WindowedNotificationObserver fullscreen_observer( |
| 874 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | 891 chrome::NOTIFICATION_FULLSCREEN_CHANGED, |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1178 | 1195 |
| 1179 // The normal browser should now have four. | 1196 // The normal browser should now have four. |
| 1180 EXPECT_EQ(4, browser()->tab_count()); | 1197 EXPECT_EQ(4, browser()->tab_count()); |
| 1181 | 1198 |
| 1182 // Close the additional browsers. | 1199 // Close the additional browsers. |
| 1183 popup_browser->CloseAllTabs(); | 1200 popup_browser->CloseAllTabs(); |
| 1184 app_browser->CloseAllTabs(); | 1201 app_browser->CloseAllTabs(); |
| 1185 app_popup_browser->CloseAllTabs(); | 1202 app_popup_browser->CloseAllTabs(); |
| 1186 } | 1203 } |
| 1187 #endif | 1204 #endif |
| OLD | NEW |