Chromium Code Reviews| 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) | |
| 10 #include "base/mac/mac_util.h" | |
| 11 #endif | |
| 9 #include "base/sys_info.h" | 12 #include "base/sys_info.h" |
| 10 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 11 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
| 12 #include "chrome/browser/defaults.h" | 15 #include "chrome/browser/defaults.h" |
| 13 #include "chrome/browser/extensions/extension_browsertest.h" | 16 #include "chrome/browser/extensions/extension_browsertest.h" |
| 14 #include "chrome/browser/extensions/extension_service.h" | 17 #include "chrome/browser/extensions/extension_service.h" |
| 15 #include "chrome/browser/extensions/extension_tab_helper.h" | 18 #include "chrome/browser/extensions/extension_tab_helper.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/tabs/pinned_tab_codec.h" | 20 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 18 #include "chrome/browser/tabs/tab_strip_model.h" | 21 #include "chrome/browser/tabs/tab_strip_model.h" |
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 817 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); | 820 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); |
| 818 | 821 |
| 819 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | 822 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); |
| 820 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | 823 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); |
| 821 ASSERT_TRUE(browser()->window()->IsFullscreen()); | 824 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 822 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false); | 825 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false); |
| 823 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | 826 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); |
| 824 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 827 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 825 } | 828 } |
| 826 | 829 |
| 830 #if defined(OS_MACOSX) | |
| 831 IN_PROC_BROWSER_TEST_F(BrowserTest, TabEntersPresentationModeFromWindowed) { | |
| 832 ASSERT_TRUE(test_server()->Start()); | |
| 833 | |
| 834 AddTabAtIndex(0, GURL("about:blank"), PageTransition::TYPED); | |
| 835 | |
| 836 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); | |
| 837 | |
| 838 EXPECT_FALSE(browser()->window()->IsFullscreen()); | |
| 839 EXPECT_FALSE(browser()->window()->InPresentationMode()); | |
| 840 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | |
| 841 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
| 842 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 843 ASSERT_TRUE(browser()->window()->InPresentationMode()); | |
| 844 browser()->TogglePresentationMode(); | |
| 845 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
| 846 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 847 ASSERT_FALSE(browser()->window()->InPresentationMode()); | |
| 848 | |
| 849 if (base::mac::IsOSLionOrLater()) { | |
| 850 // Test that tab fullscreen mode doesn't make presentation mode the default | |
| 851 // on Lion. | |
| 852 browser()->ToggleFullscreenMode(); | |
| 853 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
| 854 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 855 ASSERT_FALSE(browser()->window()->InPresentationMode()); | |
| 856 } | |
| 857 } | |
| 858 | |
| 859 IN_PROC_BROWSER_TEST_F(BrowserTest, ReturnToFullscreenInLion) { | |
| 860 if (base::mac::IsOSSnowLeopardOrEarlier()) { | |
| 861 // This test only makes sense on Lion, where it's possible to be in | |
| 862 // fullscreen mode but not in presentation mode. | |
| 863 return; | |
|
Nico
2011/09/16 18:18:46
This is mostly useless, since we don't have bots t
| |
| 864 } | |
| 865 ASSERT_TRUE(test_server()->Start()); | |
| 866 | |
| 867 AddTabAtIndex(0, GURL("about:blank"), PageTransition::TYPED); | |
| 868 | |
| 869 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); | |
| 870 | |
| 871 browser()->ToggleFullscreenMode(); | |
| 872 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
| 873 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 874 ASSERT_FALSE(browser()->window()->InPresentationMode()); | |
| 875 | |
| 876 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | |
| 877 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
| 878 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 879 ASSERT_TRUE(browser()->window()->InPresentationMode()); | |
| 880 | |
| 881 browser()->TogglePresentationMode(); | |
| 882 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); | |
| 883 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 884 ASSERT_FALSE(browser()->window()->InPresentationMode()); | |
| 885 } | |
| 886 #endif | |
| 887 | |
| 827 // Chromeos defaults to restoring the last session, so this test isn't | 888 // Chromeos defaults to restoring the last session, so this test isn't |
| 828 // applicable. | 889 // applicable. |
| 829 #if !defined(OS_CHROMEOS) | 890 #if !defined(OS_CHROMEOS) |
| 830 #if defined(OS_MACOSX) | 891 #if defined(OS_MACOSX) |
| 831 // Crashy, http://crbug.com/38522 | 892 // Crashy, http://crbug.com/38522 |
| 832 #define RestorePinnedTabs DISABLED_RestorePinnedTabs | 893 #define RestorePinnedTabs DISABLED_RestorePinnedTabs |
| 833 #endif | 894 #endif |
| 834 // Makes sure pinned tabs are restored correctly on start. | 895 // Makes sure pinned tabs are restored correctly on start. |
| 835 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { | 896 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { |
| 836 ASSERT_TRUE(test_server()->Start()); | 897 ASSERT_TRUE(test_server()->Start()); |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1065 | 1126 |
| 1066 // The normal browser should now have four. | 1127 // The normal browser should now have four. |
| 1067 EXPECT_EQ(4, browser()->tab_count()); | 1128 EXPECT_EQ(4, browser()->tab_count()); |
| 1068 | 1129 |
| 1069 // Close the additional browsers. | 1130 // Close the additional browsers. |
| 1070 popup_browser->CloseAllTabs(); | 1131 popup_browser->CloseAllTabs(); |
| 1071 app_browser->CloseAllTabs(); | 1132 app_browser->CloseAllTabs(); |
| 1072 app_popup_browser->CloseAllTabs(); | 1133 app_popup_browser->CloseAllTabs(); |
| 1073 } | 1134 } |
| 1074 #endif | 1135 #endif |
| OLD | NEW |