Handle mouselock allowed in content settings while fullscreen is not.

chrome/browser/ui/fullscreen_controller.cc

 // Copyright (c) 2011 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 "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 40 matching lines @@
     return;
   }
 
   if (mouse_lock_state_ == MOUSELOCK_ACCEPTED) {
     tab->GotResponseToLockMouseRequest(true);
     return;
   }
 
   switch (GetMouseLockSetting(tab->GetURL())) {
     case CONTENT_SETTING_ALLOW:
-      mouse_lock_state_ = MOUSELOCK_ACCEPTED;
-      tab->GotResponseToLockMouseRequest(true);
+      if (tab_fullscreen_accepted_) {
+        mouse_lock_state_ = MOUSELOCK_ACCEPTED;
+        tab->GotResponseToLockMouseRequest(true);
+      } else {
+        mouse_lock_state_ = MOUSELOCK_REQUESTED;
+      }
       break;
     case CONTENT_SETTING_BLOCK:
       mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
       tab->GotResponseToLockMouseRequest(false);
       break;
     case CONTENT_SETTING_ASK:
       mouse_lock_state_ = MOUSELOCK_REQUESTED;
       break;
     default:
       NOTREACHED();
@@ skipping 265 matching lines @@
 
 ContentSetting
     FullscreenController::GetMouseLockSetting(const GURL& url) const {
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;
 
   HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
   return settings_map->GetContentSetting(url, url,
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
 }