Windowed mode mouse lock addded to fullscreen controller.

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 ea79a51a01c6c1e76793a7ea5057869448715a9c..e5aa1851b9a88d4b0f284952d1361ac5c2263042 100644
--- a/chrome/browser/ui/fullscreen_controller.h
+++ b/chrome/browser/ui/fullscreen_controller.h
@@ -92,13 +92,15 @@ class FullscreenController : public base::RefCounted<FullscreenController> {
 
   virtual ~FullscreenController();
 
-  // Notifies the tab that it has been forced out of fullscreen mode if
-  // necessary.
-  void NotifyTabOfFullscreenExitIfNecessary();
+  // Notifies the tab that it has been forced out of fullscreen and mouse lock
+  // mode if necessary.
+  void NotifyTabOfExitIfNecessary();
+
   // Make the current tab exit fullscreen mode if it is in it.
   void ExitTabbedFullscreenModeIfNecessary();
   void UpdateFullscreenExitBubbleContent();
   void NotifyFullscreenChange();
+  void NotifyMouseLockChange();
   ContentSetting GetFullscreenSetting(const GURL& url) const;
   ContentSetting GetMouseLockSetting(const GURL& url) const;
 
@@ -125,6 +127,11 @@ class FullscreenController : public base::RefCounted<FullscreenController> {
   // clicking the allow button on the fullscreen infobar.
   bool tab_fullscreen_accepted_;
 
+  bool in_or_entering_fullscreen_;

[yzshen1, 2012/04/30 19:32:40]

[something to consider/discuss]
As the state gets more and more complex[1], I am thinking it may be good to have
a method, say, ValidateState() to check that all these variables are in a
consistent state. (For example, fullscreened_tab_ is never non-NULL when
in_or_entering_fullscreen_ is false.) It will serve as documentation of the
relation between these variables. And we can use it with DCHECK so it won't run
in release build.

=======================
[1] It took me a while to recall why (fullscreened_tab_ != NULL) is not the same
as in_or_entering_fullscreen_.

[scheib, 2012/05/01 03:27:07]

ValidateState() is an interesting idea. It would also be pretty complex I think.
I've been expanding the browser tests (before this patch, and in this patch) to
do more scrutinizing of state.

For this variable, I've renamed it to toggled_into_fullscreen_, and added a
comment pointing out it is also used for browser fullscreen.

+
+  // Wrapper for current tab with mouse lock.
+  TabContentsWrapper* mouse_lock_tab_;

[yzshen1, 2012/04/30 19:32:40]

Maybe add comment that |mouse_lock_tab_| is not NULL <==>
!MOUSELOCK_NOT_REQUESTED.

[scheib, 2012/05/01 03:27:07]

Done.

+
   MouseLockState mouse_lock_state_;
 
   DISALLOW_COPY_AND_ASSIGN(FullscreenController);