Silent mouse lock after unlock by target

chrome/browser/ui/browser_browsertest.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 <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #if defined(OS_MACOSX)
@@ skipping 246 matching lines @@
     ASSERT_EQ(browser()->window()->IsFullscreen(), !enter_fullscreen);
     FullscreenNotificationObserver fullscreen_observer;
 
     browser()->ToggleFullscreenMode();
 
     fullscreen_observer.Wait();
     ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
     ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen);
   }
 
-  void RequestToLockMouse(content::WebContents* tab, bool user_gesture) {
-    browser()->RequestToLockMouse(tab, user_gesture);
+  void RequestToLockMouse(content::WebContents* tab, bool user_gesture,

[scheib, 2012/05/30 16:41:21]

If we go with enums, we should plumb them all the way through to the call sites.

+      bool after_target_unlock_request) {
+    browser()->RequestToLockMouse(
+        tab,
+        user_gesture ? content::USER_GESTURE : content::NOT_USER_GESTURE,
+        after_target_unlock_request ? content::TARGET : content::NOT_TARGET);
   }
 
   void LostMouseLock() {
     browser()->LostMouseLock();
   }
 
   bool SendEscapeToFullscreenController() {
     return browser()->fullscreen_controller_->HandleUserPressedEscape();
   }
 
@@ skipping 774 matching lines @@
   AddTabAtIndex(0, GURL(chrome::kAboutBlankURL),
                 content::PAGE_TRANSITION_TYPED);
   AddTabAtIndex(1, GURL(chrome::kAboutBlankURL),
                 content::PAGE_TRANSITION_TYPED);
 
   WebContents* fullscreen_tab = browser()->GetSelectedWebContents();
 
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(fullscreen_tab, true));
 
   // Request mouse lock and verify the bubble is waiting for user confirmation.
-  RequestToLockMouse(fullscreen_tab, true);
+  RequestToLockMouse(fullscreen_tab, true, false);
   ASSERT_TRUE(IsMouseLockPermissionRequested());
 
   // Accept mouse lock and verify bubble no longer shows confirmation buttons.
   AcceptCurrentFullscreenOrMouseLockRequest();
   ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
 }
 
 // Tests mouse lock then fullscreen.
 IN_PROC_BROWSER_TEST_F(BrowserTest, MouseLockThenFullscreen) {
   ASSERT_TRUE(test_server()->Start());
@@ skipping 205 matching lines @@
     FullscreenNotificationObserver fullscreen_observer;
     SendEscapeToFullscreenController();
     fullscreen_observer.Wait();
   }
   ASSERT_FALSE(IsMouseLocked());
   ASSERT_FALSE(IsFullscreenForTabOrPending());
   ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_FALSE(IsMouseLockPermissionRequested());
 }
 
+IN_PROC_BROWSER_TEST_F(BrowserTest, MouseLockSilentAfterTargetUnlock) {
+  ASSERT_TRUE(test_server()->Start());
+  ui_test_utils::NavigateToURL(browser(),
+                               test_server()->GetURL(kFullscreenMouseLockHTML));
+
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // Lock the mouse with a user gesture.
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+      browser(), ui::VKEY_1, false, false, false, false,
+      chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+      content::NotificationService::AllSources()));
+  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
+  ASSERT_TRUE(IsMouseLockPermissionRequested());
+  ASSERT_FALSE(IsMouseLocked());
+
+  // Accept mouse lock.
+  AcceptCurrentFullscreenOrMouseLockRequest();
+  ASSERT_TRUE(IsMouseLocked());
+  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
+
+  // Unlock the mouse from target, make sure it's unloacked
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_U, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_FALSE(IsMouseLocked());
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // Lock mouse again, make sure it works with no bubble
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_1, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_TRUE(IsMouseLocked());
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // Unlock the mouse again by target
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_U, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_FALSE(IsMouseLocked());
+
+  // Lock from target, not user gesture, make sure it works
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_D, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_TRUE(IsMouseLocked());
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // Unlock by escape
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+          browser(), ui::VKEY_ESCAPE, false, false, false, false,
+          chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+          content::NotificationService::AllSources()));
+  ASSERT_FALSE(IsMouseLocked());
+
+  // Lock the mouse with a user gesture, make sure we see bubble again
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+      browser(), ui::VKEY_1, false, false, false, false,
+      chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+      content::NotificationService::AllSources()));
+  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
+  ASSERT_TRUE(IsMouseLocked());
+}
+
 // Helper method to be called by multiple tests.
 // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
 void BrowserTest::TestFullscreenMouseLockContentSettings() {
   GURL url = test_server()->GetURL("simple.html");
   AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED);
   WebContents* tab = browser()->GetSelectedWebContents();
 
   // Validate that going fullscreen for a URL defaults to asking permision.
   ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(tab, true));
@@ skipping 13 matching lines @@
   // Now, fullscreen should not prompt for permission.
   ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(tab, true));
   ASSERT_FALSE(IsFullscreenPermissionRequested());
 
   // Leaving tab in fullscreen, now test mouse lock ALLOW:
 
   // Validate that mouse lock defaults to asking permision.
   ASSERT_FALSE(IsMouseLockPermissionRequested());
   ASSERT_FALSE(IsMouseLocked());
-  RequestToLockMouse(tab, true);
+  RequestToLockMouse(tab, true, false);
   ASSERT_TRUE(IsMouseLockPermissionRequested());
   LostMouseLock();
 
   // Add content setting to ALLOW mouse lock.
   settings_map->SetContentSetting(
       pattern, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(),
       CONTENT_SETTING_ALLOW);
 
   // Now, mouse lock should not prompt for permission.
   ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(tab, true);
+  RequestToLockMouse(tab, true, false);
   ASSERT_FALSE(IsMouseLockPermissionRequested());
   LostMouseLock();
 
   // Leaving tab in fullscreen, now test mouse lock BLOCK:
 
   // Add content setting to BLOCK mouse lock.
   settings_map->SetContentSetting(
       pattern, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(),
       CONTENT_SETTING_BLOCK);
 
   // Now, mouse lock should not be pending.
   ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(tab, true);
+  RequestToLockMouse(tab, true, false);
   ASSERT_FALSE(IsMouseLockPermissionRequested());
 }
 
 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
 IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenMouseLockContentSettings) {
   TestFullscreenMouseLockContentSettings();
 }
 
 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK,
 // but with the browser initiated in fullscreen mode first.
@@ skipping 780 matching lines @@
      command_line->AppendSwitchASCII(switches::kApp, url.spec());
    }
 };
 
 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) {
   // Test that an application browser window loads correctly.
 
   // Verify the browser is in application mode.
   EXPECT_TRUE(browser()->IsApplication());
 }