Exit tabbed fullscreen mode on navigation.

chrome/browser/ui/browser.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 "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 113 matching lines @@
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/navigation_controller.h"
+#include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/content_restriction.h"
 #include "content/common/content_switches.h"
 #include "content/common/notification_service.h"
 #include "content/common/page_transition_types.h"
 #include "content/common/page_zoom.h"
 #include "content/common/view_messages.h"
 #include "grit/chromium_strings.h"
@@ skipping 1551 matching lines @@
   // BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
 
   // TODO: convert mac to invoke WindowFullscreenStateChanged once it updates
   // the necessary state of the frame.
 #if defined(OS_MACOSX)
   WindowFullscreenStateChanged();
 #endif
 }
 
 void Browser::NotifyTabOfFullscreenExitIfNecessary() {
-  if (fullscreened_tab_)
+  if (fullscreened_tab_) {
     fullscreened_tab_->ExitFullscreenMode();
+    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        Source<NavigationController>(&fullscreened_tab_->controller()));
+  }
   fullscreened_tab_ = NULL;
   tab_caused_fullscreen_ = false;
 }
 
 #if defined(OS_MACOSX)
 void Browser::TogglePresentationMode() {
   window_->SetPresentationMode(!window_->InPresentationMode());
   WindowFullscreenStateChanged();
 }
 #endif
@@ skipping 2084 matching lines @@
 
 void Browser::EnumerateDirectory(TabContents* tab, int request_id,
                                  const FilePath& path) {
   EnumerateDirectoryHelper(tab, request_id, path);
 }
 
 void Browser::ToggleFullscreenModeForTab(TabContents* tab,
     bool enter_fullscreen) {
   if (tab != GetSelectedTabContents())
     return;
-  fullscreened_tab_ = enter_fullscreen ?
-      TabContentsWrapper::GetCurrentWrapperForContents(tab) : NULL;
+  if (enter_fullscreen) {
+    fullscreened_tab_ =
+      TabContentsWrapper::GetCurrentWrapperForContents(tab);
+    registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        Source<NavigationController>(&fullscreened_tab_->controller()));
+  } else {
+    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        Source<NavigationController>(&fullscreened_tab_->controller()));
+    fullscreened_tab_ = NULL;
+  }
   bool in_correct_mode_for_tab_fullscreen;
 #if defined(OS_MACOSX)
   in_correct_mode_for_tab_fullscreen = window_->InPresentationMode();
 #else
   in_correct_mode_for_tab_fullscreen = window_->IsFullscreen();
 #endif
   if (enter_fullscreen && !in_correct_mode_for_tab_fullscreen)
     tab_caused_fullscreen_ = true;
   if (tab_caused_fullscreen_) {
 #if defined(OS_MACOSX)
@@ skipping 306 matching lines @@
     }
 
     case content::NOTIFICATION_INTERSTITIAL_ATTACHED:
       UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
       break;
 
     case chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED:
       if (profile_->IsSameProfile(Source<Profile>(source).ptr()))
         UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE);
       break;
+    case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
+      const content::LoadCommittedDetails& lcd =
+        *Details<content::LoadCommittedDetails>(details).ptr();
+      if (lcd.type != NavigationType::AUTO_SUBFRAME &&
+          lcd.type != NavigationType::NEW_SUBFRAME &&
+          lcd.type != NavigationType::NAV_IGNORE) {

[Peter Kasting, 2011/09/26 20:24:58]

This still seems suspicious to me.  Why aren't you using
is_navigation_to_different_page() instead?  This kind of case is what it was
created for, I think.  Otherwise we'll still get things like fragment
navigations wrong.

[koz (OOO until 15th September), 2011/09/26 23:55:58]

I figured I'd err on the side of caution with fragment navigations as they might
be to fragments outside the fullscreened element. It should still work either
way though.

+        ExitTabbedFullscreenModeIfNecessary();
+      }
+      break;
+    }
 
     default:
       NOTREACHED() << "Got a notification we didn't register for.";
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, ProfileSyncServiceObserver implementation:
 
 void Browser::OnStateChanged() {
@@ skipping 1101 matching lines @@
       profile()->GetOriginalProfile()->GetProfileSyncService();
   if (service->HasSyncSetupCompleted())
     ShowOptionsTab(chrome::kSyncSetupSubPage);
   else
     service->ShowLoginDialog();
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedTabContentsWrapper()->render_view_host()->ToggleSpeechInput();
 }