diff options
Diffstat (limited to 'chrome/browser/ui/fullscreen')
3 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.cc b/chrome/browser/ui/fullscreen/fullscreen_controller.cc index 236bc2e..d1fcc63 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller.cc @@ -170,14 +170,6 @@ void FullscreenController::RequestToLockMouse(WebContents* web_contents, 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; - } - // 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 diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc index cdc4631..da86e2a 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc @@ -19,10 +19,6 @@ using content::WebContents; const char FullscreenControllerTest::kFullscreenMouseLockHTML[] = "files/fullscreen_mouselock/fullscreen_mouselock.html"; -void FullscreenControllerTest::SetUpCommandLine(CommandLine* command_line) { - command_line->AppendSwitch(switches::kEnablePointerLock); -} - void FullscreenControllerTest::RequestToLockMouse( bool user_gesture, bool last_unlocked_by_target) { diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_test.h b/chrome/browser/ui/fullscreen/fullscreen_controller_test.h index baaea67..eee66d9 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_test.h +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_test.h @@ -38,7 +38,6 @@ class FullscreenControllerTest : public InProcessBrowserTest { protected: FullscreenControllerTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; void RequestToLockMouse(bool user_gesture, bool last_unlocked_by_target); void LostMouseLock(); |