Exit tabbed fullscreen mode on navigation.

chrome/browser/ui/browser_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
@@ skipping 49 matching lines @@
     "</body></html>";
 
 const char* kOpenNewBeforeUnloadPage =
     "w=window.open(); w.onbeforeunload=function(e){return 'foo'};";
 
 const FilePath::CharType* kBeforeUnloadFile =
     FILE_PATH_LITERAL("beforeunload.html");
 
 const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
 const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");
+const FilePath::CharType* kSubFrameNavigationFile =
+    FILE_PATH_LITERAL("subframe-navigation.html");
 
 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
 
 // Given a page title, returns the expected window caption string.
 std::wstring WindowCaptionFromPageTitle(std::wstring page_title) {
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
   // On Mac or ChromeOS, we don't want to suffix the page title with
   // the application name.
   if (page_title.empty()) {
     return UTF16ToWideHack(
@@ skipping 766 matching lines @@
   {
     ui_test_utils::WindowedNotificationObserver fullscreen_observer(
         chrome::NOTIFICATION_FULLSCREEN_CHANGED,
         NotificationService::AllSources());
     browser()->ToggleFullscreenModeForTab(fullscreen_tab, false);
     fullscreen_observer.Wait();
     ASSERT_FALSE(browser()->window()->IsFullscreen());
   }
 }
 
+IN_PROC_BROWSER_TEST_F(BrowserTest, TestTabExitsFullscreenOnNavigation) {
+  ASSERT_TRUE(test_server()->Start());
+
+  ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
+  ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
+
+  TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
+
+  ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
+      chrome::NOTIFICATION_FULLSCREEN_CHANGED,
+      NotificationService::AllSources());
+  browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
+  tree_updated_observer1.Wait();
+
+  ASSERT_TRUE(browser()->window()->IsFullscreen());
+
+  ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
+      chrome::NOTIFICATION_FULLSCREEN_CHANGED,
+      NotificationService::AllSources());
+  browser()->GoBack(CURRENT_TAB);
+  tree_updated_observer2.Wait();
+
+  ASSERT_FALSE(browser()->window()->IsFullscreen());
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserTest,
+                       TestTabDoesntExitFullscreenOnSubFrameNavigation) {
+  ASSERT_TRUE(test_server()->Start());
+
+  GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+                                     FilePath(kSubFrameNavigationFile)));
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
+
+  ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
+      chrome::NOTIFICATION_FULLSCREEN_CHANGED,
+      NotificationService::AllSources());
+  browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
+  tree_updated_observer1.Wait();
+  ASSERT_TRUE(browser()->window()->IsFullscreen());
+
+  fullscreen_tab->render_view_host()->
+      ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("navigate();"));
+  ASSERT_TRUE(browser()->window()->IsFullscreen());
+}
+
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(BrowserTest, TabEntersPresentationModeFromWindowed) {
   ASSERT_TRUE(test_server()->Start());
 
   AddTabAtIndex(0, GURL(chrome::kAboutBlankURL), PageTransition::TYPED);
 
   TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
 
   {
     ui_test_utils::WindowedNotificationObserver fullscreen_observer(
@@ skipping 272 matching lines @@
 
   // The normal browser should now have four.
   EXPECT_EQ(4, browser()->tab_count());
 
   // Close the additional browsers.
   popup_browser->CloseAllTabs();
   app_browser->CloseAllTabs();
   app_popup_browser->CloseAllTabs();
 }
 #endif