Exit mouse lock or fullscreen on navigation and reload.

chrome/browser/ui/fullscreen_controller.h

Index: chrome/browser/ui/fullscreen_controller.h
diff --git a/chrome/browser/ui/fullscreen_controller.h b/chrome/browser/ui/fullscreen_controller.h
index ef7eac81743823fe6fa389736663f4f1ae982ab7..f8ff72d2fbcaa21298b3741cb460eb4c88ab7840 100644
--- a/chrome/browser/ui/fullscreen_controller.h
+++ b/chrome/browser/ui/fullscreen_controller.h
@@ -119,11 +119,7 @@ class FullscreenController : public base::RefCounted<FullscreenController>,
   // 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();
@@ -139,6 +135,9 @@ class FullscreenController : public base::RefCounted<FullscreenController>,
   // 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_;
@@ -166,10 +165,6 @@ class FullscreenController : public base::RefCounted<FullscreenController>,
 
   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);
 };