| 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 #endif |
| 859 |
| 827 // Chromeos defaults to restoring the last session, so this test isn't | 860 // Chromeos defaults to restoring the last session, so this test isn't |
| 828 // applicable. | 861 // applicable. |
| 829 #if !defined(OS_CHROMEOS) | 862 #if !defined(OS_CHROMEOS) |
| 830 #if defined(OS_MACOSX) | 863 #if defined(OS_MACOSX) |
| 831 // Crashy, http://crbug.com/38522 | 864 // Crashy, http://crbug.com/38522 |
| 832 #define RestorePinnedTabs DISABLED_RestorePinnedTabs | 865 #define RestorePinnedTabs DISABLED_RestorePinnedTabs |
| 833 #endif | 866 #endif |
| 834 // Makes sure pinned tabs are restored correctly on start. | 867 // Makes sure pinned tabs are restored correctly on start. |
| 835 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { | 868 IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { |
| 836 ASSERT_TRUE(test_server()->Start()); | 869 ASSERT_TRUE(test_server()->Start()); |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1065 | 1098 |
| 1066 // The normal browser should now have four. | 1099 // The normal browser should now have four. |
| 1067 EXPECT_EQ(4, browser()->tab_count()); | 1100 EXPECT_EQ(4, browser()->tab_count()); |
| 1068 | 1101 |
| 1069 // Close the additional browsers. | 1102 // Close the additional browsers. |
| 1070 popup_browser->CloseAllTabs(); | 1103 popup_browser->CloseAllTabs(); |
| 1071 app_browser->CloseAllTabs(); | 1104 app_browser->CloseAllTabs(); |
| 1072 app_popup_browser->CloseAllTabs(); | 1105 app_popup_browser->CloseAllTabs(); |
| 1073 } | 1106 } |
| 1074 #endif | 1107 #endif |
| OLD | NEW |