Mouse lock and fullscreen exit upon reload.

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"
@@ skipping 59 matching lines @@
 
 bool FullscreenController::IsMouseLocked() const {
   return mouse_lock_state_ == MOUSELOCK_ACCEPTED ||
          mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENTLY;
 }
 
 void FullscreenController::RequestToLockMouse(WebContents* web_contents,
                                               bool user_gesture,
                                               bool last_unlocked_by_target) {
   DCHECK(!IsMouseLocked());
+  NotifyMouseLockChange();
 
   // Check for command line switch disabling mouse lock when not tab fullscreen.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableNonFullscreenMouseLock) &&
       !IsFullscreenForTabOrPending(web_contents)) {
     web_contents->GotResponseToLockMouseRequest(false);
     return;
   }
 
-  NotifyMouseLockChange();
-
   // Must have a user gesture to prevent misbehaving sites from constantly
   // re-locking the mouse. Exceptions are when the page has unlocked
   // (i.e. not the user), or if we're in tab fullscreen (user gesture required
   // for that)
   if (!last_unlocked_by_target && !user_gesture &&
       !IsFullscreenForTabOrPending(web_contents)) {
     web_contents->GotResponseToLockMouseRequest(false);
     return;
   }
   mouse_lock_tab_ = TabContents::FromWebContents(web_contents);
@@ skipping 230 matching lines @@
 bool FullscreenController::HandleUserPressedEscape() {
   if (IsFullscreenForTabOrPending() ||
       IsMouseLocked() || IsMouseLockRequested()) {
     ExitTabFullscreenOrMouseLockIfNecessary();
     return true;
   }
 
   return false;
 }
 
+bool FullscreenController::HandleUserPressedReload() {
+  if (IsFullscreenForTabOrPending() ||
+      IsMouseLocked() || IsMouseLockRequested()) {
+    ExitTabFullscreenOrMouseLockIfNecessary();
+  }
+
+  return false;
+}
+
 FullscreenController::~FullscreenController() {}
 
 void FullscreenController::NotifyTabOfExitIfNecessary() {
   if (fullscreened_tab_) {
     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);
+      NotifyMouseLockChange();
     } 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();
 }
@@ skipping 158 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.
 }