Exit mouse lock or fullscreen on navigation and reload.

chrome/browser/ui/fullscreen_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_FULLSCREEN_CONTROLLER_H_
 #define CHROME_BROWSER_UI_FULLSCREEN_CONTROLLER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 101 matching lines @@
     // Mouse lock has been silently accepted, no notification to user.
     MOUSELOCK_ACCEPTED_SILENTLY
   };
 
   virtual ~FullscreenController();
 
   // Notifies the tab that it has been forced out of fullscreen and mouse lock
   // mode if necessary.
   void NotifyTabOfExitIfNecessary();
 
-  // Makes the browser exit fullscreen mode when a navigation occurs.
-  void EnterCancelFullscreenOnNavigateMode();
-
-  // Makes the browser no longer exit fullscreen mode when a navigation occurs.
-  void ExitCancelFullscreenOnNavigateMode();
+  void UpdateNotificationRegistrations();
 
   // Make the current tab exit fullscreen mode or mouse lock if it is in it.
   void ExitTabFullscreenOrMouseLockIfNecessary();
   void UpdateFullscreenExitBubbleContent();
   void NotifyFullscreenChange(bool is_fullscreen);
   void NotifyMouseLockChange();
   ContentSetting GetFullscreenSetting(const GURL& url) const;
   ContentSetting GetMouseLockSetting(const GURL& url) const;
 
 #if defined(OS_MACOSX)
   void TogglePresentationModeInternal(bool for_tab);
 #endif
   // TODO(koz): Change |for_tab| to an enum.
   void ToggleFullscreenModeInternal(bool for_tab);
 
+  void set_fullscreened_tab(TabContents* tab);

[yzshen1, 2012/06/20 18:07:54]

- nit: please use SetFullscreenedTab.
- optional: please add comments for |fullscreened_tab_| and |mouse_lock_tab_|
that they should only be set via these setters.

[scheib, 2012/06/20 20:38:24]

Done.

+  void set_mouse_lock_tab(TabContents* tab);
+
   BrowserWindow* window_;
   Profile* profile_;
   Browser* browser_;
 
   // If there is currently a tab in fullscreen mode (entered via
   // webkitRequestFullScreen), this is its TabContents.
   TabContents* fullscreened_tab_;
 
   // The URL of the extension which trigerred "browser fullscreen" mode.
   GURL extension_caused_fullscreen_;
 
   // True if the current tab entered fullscreen mode via webkitRequestFullScreen
   bool tab_caused_fullscreen_;
   // True if tab fullscreen has been allowed, either by settings or by user
   // clicking the allow button on the fullscreen infobar.
   bool tab_fullscreen_accepted_;
 
   // True if this controller has toggled into tab OR browser fullscreen.
   bool toggled_into_fullscreen_;
 
   // TabContents for current tab requesting or currently in mouse lock.
   TabContents* mouse_lock_tab_;
 
   MouseLockState mouse_lock_state_;
 
   content::NotificationRegistrar registrar_;
 
-  // If this is true then we are listening for navigation events and will
-  // cancel fullscreen when one occurs.
-  bool cancel_fullscreen_on_navigate_mode_;
-
   DISALLOW_COPY_AND_ASSIGN(FullscreenController);
 };
 
 #endif  // CHROME_BROWSER_UI_FULLSCREEN_CONTROLLER_H_