Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 7966031: Exit tabbed fullscreen mode on navigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to comments Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« chrome/browser/ui/browser.cc ('K') | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); 820 TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
821 821
822 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); 822 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
823 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); 823 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED);
824 ASSERT_TRUE(browser()->window()->IsFullscreen()); 824 ASSERT_TRUE(browser()->window()->IsFullscreen());
825 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false); 825 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false);
826 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED); 826 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED);
827 ASSERT_FALSE(browser()->window()->IsFullscreen()); 827 ASSERT_FALSE(browser()->window()->IsFullscreen());
828 } 828 }
829 829
830 IN_PROC_BROWSER_TEST_F(BrowserTest, TestTabExitsFullscreenOnNavigation) {
831 ASSERT_TRUE(test_server()->Start());
832
833 ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
834 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
835
836 TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
837
838 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
839 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED);
840 ASSERT_TRUE(browser()->window()->IsFullscreen());
841 browser()->GoBack(CURRENT_TAB);
842 ui_test_utils::WaitForNotification(chrome::NOTIFICATION_FULLSCREEN_CHANGED);
843 ASSERT_FALSE(browser()->window()->IsFullscreen());
844 }
845
830 #if defined(OS_MACOSX) 846 #if defined(OS_MACOSX)
831 IN_PROC_BROWSER_TEST_F(BrowserTest, TabEntersPresentationModeFromWindowed) { 847 IN_PROC_BROWSER_TEST_F(BrowserTest, TabEntersPresentationModeFromWindowed) {
832 ASSERT_TRUE(test_server()->Start()); 848 ASSERT_TRUE(test_server()->Start());
833 849
834 AddTabAtIndex(0, GURL("about:blank"), PageTransition::TYPED); 850 AddTabAtIndex(0, GURL("about:blank"), PageTransition::TYPED);
835 851
836 TabContents* fullscreen_tab = browser()->GetSelectedTabContents(); 852 TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
837 853
838 EXPECT_FALSE(browser()->window()->IsFullscreen()); 854 EXPECT_FALSE(browser()->window()->IsFullscreen());
839 EXPECT_FALSE(browser()->window()->InPresentationMode()); 855 EXPECT_FALSE(browser()->window()->InPresentationMode());
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 1114
1099 // The normal browser should now have four. 1115 // The normal browser should now have four.
1100 EXPECT_EQ(4, browser()->tab_count()); 1116 EXPECT_EQ(4, browser()->tab_count());
1101 1117
1102 // Close the additional browsers. 1118 // Close the additional browsers.
1103 popup_browser->CloseAllTabs(); 1119 popup_browser->CloseAllTabs();
1104 app_browser->CloseAllTabs(); 1120 app_browser->CloseAllTabs();
1105 app_popup_browser->CloseAllTabs(); 1121 app_popup_browser->CloseAllTabs();
1106 } 1122 }
1107 #endif 1123 #endif
OLDNEW
« chrome/browser/ui/browser.cc ('K') | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698