Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1613)

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 10173030: User Gesture plumbed from Renderer to Browser's FullscreenController::RequestToLockMouse. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yzshen nits fixed. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/fullscreen_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 8e65adebecb7cb7c9fb713982d92272c630e9cba..4ad632ca66995e35248f91af397def9d1965bf8a 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -247,8 +247,8 @@ class BrowserTest : public ExtensionBrowserTest {
ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen);
}
- void RequestToLockMouse(content::WebContents* tab) {
- browser()->RequestToLockMouse(tab);
+ void RequestToLockMouse(content::WebContents* tab, bool user_gesture) {
+ browser()->RequestToLockMouse(tab, user_gesture);
}
void LostMouseLock() {
@@ -1028,7 +1028,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, TestFullscreenBubbleMouseLockState) {
ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(fullscreen_tab, true));
// Request mouse lock and verify the bubble is waiting for user confirmation.
- RequestToLockMouse(fullscreen_tab);
+ RequestToLockMouse(fullscreen_tab, true);
ASSERT_TRUE(IsMouseLockPermissionRequested());
// Accept mouse lock and verify bubble no longer shows confirmation buttons.
@@ -1041,7 +1041,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MouseLockThenFullscreen) {
WebContents* tab = browser()->GetSelectedWebContents();
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
- RequestToLockMouse(tab);
+ RequestToLockMouse(tab, true);
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(tab, true));
@@ -1082,7 +1082,7 @@ void BrowserTest::TestFullscreenMouseLockContentSettings() {
// Validate that mouse lock defaults to asking permision.
ASSERT_FALSE(IsMouseLockPermissionRequested());
ASSERT_FALSE(IsMouseLockedOrPending());
- RequestToLockMouse(tab);
+ RequestToLockMouse(tab, true);
ASSERT_TRUE(IsMouseLockPermissionRequested());
ASSERT_TRUE(IsMouseLockedOrPending());
LostMouseLock();
@@ -1096,7 +1096,7 @@ void BrowserTest::TestFullscreenMouseLockContentSettings() {
// Now, mouse lock should not prompt for permission.
ASSERT_FALSE(IsMouseLockedOrPending());
ASSERT_FALSE(IsMouseLockPermissionRequested());
- RequestToLockMouse(tab);
+ RequestToLockMouse(tab, true);
ASSERT_TRUE(IsMouseLockedOrPending());
ASSERT_FALSE(IsMouseLockPermissionRequested());
LostMouseLock();
@@ -1112,7 +1112,7 @@ void BrowserTest::TestFullscreenMouseLockContentSettings() {
// Now, mouse lock should not be pending.
ASSERT_FALSE(IsMouseLockedOrPending());
ASSERT_FALSE(IsMouseLockPermissionRequested());
- RequestToLockMouse(tab);
+ RequestToLockMouse(tab, true);
ASSERT_FALSE(IsMouseLockedOrPending());
ASSERT_FALSE(IsMouseLockPermissionRequested());
}
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/fullscreen_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698