Handle mouselock allowed in content settings while fullscreen is not.

chrome/browser/ui/fullscreen_controller.cc

Index: chrome/browser/ui/fullscreen_controller.cc
diff --git a/chrome/browser/ui/fullscreen_controller.cc b/chrome/browser/ui/fullscreen_controller.cc
index 06747586826d9c6ac49f001a2e23ad34bf114b16..4a90b84ca679ee33d7dcc764fafcea23107f114b 100644
--- a/chrome/browser/ui/fullscreen_controller.cc
+++ b/chrome/browser/ui/fullscreen_controller.cc
@@ -58,8 +58,12 @@ void FullscreenController::RequestToLockMouse(TabContents* tab) {
 
   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;