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 287 matching lines @@
   // We listen to all notification sources because the bookmark bar
   // state needs to stay in sync between the incognito and normal profiles.
   registrar_.Add(this,
                  chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
                  NotificationService::AllBrowserContextsAndSources());
 
   // Need to know when to alert the user of theme install delay.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_READY_FOR_INSTALL,
                  NotificationService::AllSources());
 
+  registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,

[Peter Kasting, 2011/09/23 19:20:06]

Why is this here when you have the more-specific one below?

[koz (OOO until 15th September), 2011/09/26 08:15:21]

Oops, this was left over from previous iterations.
Removed.

+                 NotificationService::AllSources());
+
   PrefService* local_state = g_browser_process->local_state();
   if (local_state) {
     local_pref_registrar_.Init(local_state);
     local_pref_registrar_.Add(prefs::kPrintingEnabled, this);
     local_pref_registrar_.Add(prefs::kAllowFileSelectionDialogs, this);
     local_pref_registrar_.Add(prefs::kMetricsReportingEnabled, this);
   }
 
   profile_pref_registrar_.Init(profile_->GetPrefs());
   profile_pref_registrar_.Add(prefs::kDevToolsDisabled, this);
@@ skipping 1377 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,

[Peter Kasting, 2011/09/23 19:20:06]

Is this codepath guaranteed to be reached in all cases (e.g. if a tab is
closed)?  If there are any unmatched cases, you'll slowly build up bad entries
in the registrar, which could have strange consequences.

[koz (OOO until 15th September), 2011/09/26 08:15:21]

I think it is. It is equivalent to exiting tabbed fullscreen mode, so this will
get cleaned up any time that tabbed fullscreen gets exited.

+        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: {
+      ExitTabbedFullscreenModeIfNecessary();

[Peter Kasting, 2011/09/23 19:20:06]

Are you sure this is what you want to do?  It seems like this will force tabs
out of fullscreen when e.g. they have an AUTO_SUBFRAME navigation -- that
doesn't seem right.

[koz (OOO until 15th September), 2011/09/26 08:15:21]

I've added a check for NavigationTypes that should not cause tabbed fullscreen
to exit. Do they seem okay to you?

+      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();
 }