Exit tabbed fullscreen mode on navigation.

chrome/browser/ui/fullscreen_controller.cc

 // Copyright (c) 2012 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/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
+#include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 
 using content::RenderViewHost;
 using content::UserMetricsAction;
 using content::WebContents;
 
 FullscreenController::FullscreenController(BrowserWindow* window,
                                            Profile* profile,
                                            Browser* browser)
   : window_(window),
     profile_(profile),
     browser_(browser),
     fullscreened_tab_(NULL),
     tab_caused_fullscreen_(false),
     tab_fullscreen_accepted_(false),
     toggled_into_fullscreen_(false),
     mouse_lock_tab_(NULL),
-    mouse_lock_state_(MOUSELOCK_NOT_REQUESTED) {
+    mouse_lock_state_(MOUSELOCK_NOT_REQUESTED),
+    cancel_fullscreen_on_navigate_mode_(false) {
+}
+
+void FullscreenController::Observe(int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  switch (type) {
+    case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
+      if (content::Details<content::LoadCommittedDetails>(details)->
+          is_navigation_to_different_page()) {
+        ExitTabFullscreenOrMouseLockIfNecessary();
+      }
+      break;
+
+    default:
+      NOTREACHED() << "Got a notification we didn't register for.";
+  }
 }
 
 bool FullscreenController::IsFullscreenForBrowser() const {
   return window_->IsFullscreen() && !tab_caused_fullscreen_;
 }
 
 bool FullscreenController::IsFullscreenForTabOrPending() const {
   return fullscreened_tab_ != NULL;
 }
 
@@ skipping 80 matching lines @@
     return;
 
   bool in_browser_or_tab_fullscreen_mode;
 #if defined(OS_MACOSX)
   in_browser_or_tab_fullscreen_mode = window_->InPresentationMode();
 #else
   in_browser_or_tab_fullscreen_mode = window_->IsFullscreen();
 #endif
 
   if (enter_fullscreen) {
     fullscreened_tab_ = TabContents::FromWebContents(web_contents);

[sky, 2012/06/15 15:01:08]

Do we know when we get here fullscreened_tab_ is always NULL?

[koz (OOO until 15th September), 2012/06/18 02:28:10]

I'm not sure. scheib, or yzshen would probably be able to give a better answer.

[scheib, 2012/06/18 03:58:09]

As far as I can tell by inspection last Friday: I wouldn't count on it. IIRC it
isn't cleared when exiting until at least the OS actually transitions the window
out of fullscreen and we get a notification of change later. Also, double check
the logic when exiting tab fullscreen when previously in browser fullscreen.

I don't follow why wky is concerned, though?

     if (!in_browser_or_tab_fullscreen_mode) {
+      EnterCancelFullscreenOnNavigateMode();
       tab_caused_fullscreen_ = true;
 #if defined(OS_MACOSX)
       TogglePresentationModeInternal(true);
 #else
       ToggleFullscreenModeInternal(true);
 #endif
     } else {
+      ExitCancelFullscreenOnNavigateMode();

[scheib, 2012/06/15 16:12:31]

Are you certain that we only want to be in CancelFullscreenOnNavigateMode if we
transition from non-fullscreen to tab-fullscreen? Why don't we want it if we
transition from browser-fullscreen to tab-fullscreen?

Perhaps this line should be after the } else { on line 188? (and the Enter call
on line 162 should be moved up?

[koz (OOO until 15th September), 2012/06/18 02:28:10]

Ah yes, good point. Wouldn't I want to move the
ExitCancelFullscreenOnNavigateMode() call to inside the } else { started on line
180? As it shouldn't matter if we are still in fullscreen mode or not, if we are
exiting tabbed fullscreen mode it should be cancelled?

[scheib, 2012/06/18 03:58:09]

Line 180 sounds right -- mis-reading of the } else { clauses wen writing my
previous comment. 

       // We need to update the fullscreen exit bubble, e.g., going from browser
       // fullscreen to tab fullscreen will need to show different content.
       const GURL& url = web_contents->GetURL();
       if (!tab_fullscreen_accepted_) {
         tab_fullscreen_accepted_ =
             GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
       }
       UpdateFullscreenExitBubbleContent();
     }
   } else {
@@ skipping 166 matching lines @@
     return true;
   }
 
   return false;
 }
 
 FullscreenController::~FullscreenController() {}
 
 void FullscreenController::NotifyTabOfExitIfNecessary() {
   if (fullscreened_tab_) {
+    ExitCancelFullscreenOnNavigateMode();
     RenderViewHost* rvh =
         fullscreened_tab_->web_contents()->GetRenderViewHost();
     fullscreened_tab_ = NULL;
     tab_caused_fullscreen_ = false;
     tab_fullscreen_accepted_ = false;
     if (rvh)
       rvh->ExitFullscreen();
   }
 
   if (mouse_lock_tab_) {
     WebContents* web_contents = mouse_lock_tab_->web_contents();
     if (IsMouseLockRequested()) {
       web_contents->GotResponseToLockMouseRequest(false);
     } else if (web_contents->GetRenderViewHost() &&
                web_contents->GetRenderViewHost()->GetView()) {
       web_contents->GetRenderViewHost()->GetView()->UnlockMouse();
     }
     mouse_lock_tab_ = NULL;
     mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
   }
 
   UpdateFullscreenExitBubbleContent();
 }
 
+void FullscreenController::EnterCancelFullscreenOnNavigateMode() {
+  if (cancel_fullscreen_on_navigate_mode_)
+    return;
+  cancel_fullscreen_on_navigate_mode_ = true;
+  registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+      content::Source<content::NavigationController>(
+          &fullscreened_tab_->web_contents()->GetController()));
+}
+
+void FullscreenController::ExitCancelFullscreenOnNavigateMode() {
+  if (!cancel_fullscreen_on_navigate_mode_)
+    return;
+  cancel_fullscreen_on_navigate_mode_ = false;
+  registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,

[sky, 2012/06/15 15:01:08]

I think you should removeall here. Less error prone.

[koz (OOO until 15th September), 2012/06/18 02:28:10]

Done.

+      content::Source<content::NavigationController>(
+          &fullscreened_tab_->web_contents()->GetController()));
+}
+
+
 void FullscreenController::ExitTabFullscreenOrMouseLockIfNecessary() {
   if (tab_caused_fullscreen_)
     ToggleFullscreenMode();
   else
     NotifyTabOfExitIfNecessary();
 }
 
 void FullscreenController::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
@@ skipping 148 matching lines @@
     window_->ExitFullscreen();
     extension_caused_fullscreen_ = GURL();
   }
   UpdateFullscreenExitBubbleContent();
 
   // Once the window has become fullscreen it'll call back to
   // WindowFullscreenStateChanged(). We don't do this immediately as
   // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let
   // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
 }