OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 #include "chrome/browser/ui/browser_tabstrip.h" | 6 #include "chrome/browser/ui/browser_tabstrip.h" |
7 #include "chrome/browser/ui/browser_window.h" | 7 #include "chrome/browser/ui/browser_window.h" |
8 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" | 8 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" |
9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
10 #include "content/public/browser/render_view_host.h" | 10 #include "content/public/browser/render_view_host.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 | 73 |
74 // Escape, confirm we are out of mouse lock with no prompts. | 74 // Escape, confirm we are out of mouse lock with no prompts. |
75 SendEscapeToFullscreenController(); | 75 SendEscapeToFullscreenController(); |
76 ASSERT_FALSE(IsMouseLocked()); | 76 ASSERT_FALSE(IsMouseLocked()); |
77 ASSERT_FALSE(IsFullscreenForTabOrPending()); | 77 ASSERT_FALSE(IsFullscreenForTabOrPending()); |
78 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 78 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
79 ASSERT_FALSE(IsMouseLockPermissionRequested()); | 79 ASSERT_FALSE(IsMouseLockPermissionRequested()); |
80 } | 80 } |
81 | 81 |
82 // Times out sometimes on Linux. http://crbug.com/135115 | 82 // Times out sometimes on Linux. http://crbug.com/135115 |
83 #if defined(OS_LINUX) | 83 // Mac: http://crbug.com/103912 |
| 84 #if defined(OS_LINUX) || defined(OS_MACOSX) |
84 #define MAYBE_EscapingMouseLockAndFullscreen \ | 85 #define MAYBE_EscapingMouseLockAndFullscreen \ |
85 DISABLED_EscapingMouseLockAndFullscreen | 86 DISABLED_EscapingMouseLockAndFullscreen |
86 #else | 87 #else |
87 #define MAYBE_EscapingMouseLockAndFullscreen EscapingMouseLockAndFullscreen | 88 #define MAYBE_EscapingMouseLockAndFullscreen EscapingMouseLockAndFullscreen |
88 #endif | 89 #endif |
89 // Tests mouse lock and fullscreen modes can be escaped with ESC key. | 90 // Tests mouse lock and fullscreen modes can be escaped with ESC key. |
90 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 91 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
91 MAYBE_EscapingMouseLockAndFullscreen) { | 92 MAYBE_EscapingMouseLockAndFullscreen) { |
92 ASSERT_TRUE(test_server()->Start()); | 93 ASSERT_TRUE(test_server()->Start()); |
93 ui_test_utils::NavigateToURL(browser(), | 94 ui_test_utils::NavigateToURL(browser(), |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 ASSERT_FALSE(IsMouseLocked()); | 196 ASSERT_FALSE(IsMouseLocked()); |
196 | 197 |
197 // Accept fullscreen and mouse lock. | 198 // Accept fullscreen and mouse lock. |
198 AcceptCurrentFullscreenOrMouseLockRequest(); | 199 AcceptCurrentFullscreenOrMouseLockRequest(); |
199 ASSERT_TRUE(IsMouseLocked()); | 200 ASSERT_TRUE(IsMouseLocked()); |
200 ASSERT_TRUE(IsFullscreenForTabOrPending()); | 201 ASSERT_TRUE(IsFullscreenForTabOrPending()); |
201 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); | 202 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); |
202 } | 203 } |
203 | 204 |
204 // Times out sometimes on Linux. http://crbug.com/135115 | 205 // Times out sometimes on Linux. http://crbug.com/135115 |
205 #if defined(OS_LINUX) | 206 // Mac: http://crbug.com/103912 |
| 207 #if defined(OS_LINUX) || defined(OS_MACOSX) |
206 #define MAYBE_MouseLockAndFullscreen DISABLED_MouseLockAndFullscreen | 208 #define MAYBE_MouseLockAndFullscreen DISABLED_MouseLockAndFullscreen |
207 #else | 209 #else |
208 #define MAYBE_MouseLockAndFullscreen MouseLockAndFullscreen | 210 #define MAYBE_MouseLockAndFullscreen MouseLockAndFullscreen |
209 #endif | 211 #endif |
210 // Tests mouse lock then fullscreen in same request. | 212 // Tests mouse lock then fullscreen in same request. |
211 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 213 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
212 MAYBE_MouseLockAndFullscreen) { | 214 MAYBE_MouseLockAndFullscreen) { |
213 ASSERT_TRUE(test_server()->Start()); | 215 ASSERT_TRUE(test_server()->Start()); |
214 ui_test_utils::NavigateToURL(browser(), | 216 ui_test_utils::NavigateToURL(browser(), |
215 test_server()->GetURL(kFullscreenMouseLockHTML)); | 217 test_server()->GetURL(kFullscreenMouseLockHTML)); |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 | 415 |
414 // Accept mouse lock. | 416 // Accept mouse lock. |
415 AcceptCurrentFullscreenOrMouseLockRequest(); | 417 AcceptCurrentFullscreenOrMouseLockRequest(); |
416 ASSERT_TRUE(IsMouseLocked()); | 418 ASSERT_TRUE(IsMouseLocked()); |
417 | 419 |
418 // Navigate to url with fragment. Mouse lock should persist. | 420 // Navigate to url with fragment. Mouse lock should persist. |
419 ui_test_utils::NavigateToURL(browser(), url_with_fragment); | 421 ui_test_utils::NavigateToURL(browser(), url_with_fragment); |
420 ASSERT_TRUE(IsMouseLocked()); | 422 ASSERT_TRUE(IsMouseLocked()); |
421 } | 423 } |
422 | 424 |
423 #if defined(OS_WIN) || defined(OS_LINUX) | 425 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) |
424 // http://crbug.com/137486 | 426 // http://crbug.com/137486 |
| 427 // mac: http://crbug.com/103912 |
425 #define ReloadExitsMouseLockAndFullscreen DISABLED_ReloadExitsMouseLockAndFullsc
reen | 428 #define ReloadExitsMouseLockAndFullscreen DISABLED_ReloadExitsMouseLockAndFullsc
reen |
426 #endif | 429 #endif |
427 // Tests Mouse Lock and Fullscreen are exited upon reload. | 430 // Tests Mouse Lock and Fullscreen are exited upon reload. |
428 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 431 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
429 ReloadExitsMouseLockAndFullscreen) { | 432 ReloadExitsMouseLockAndFullscreen) { |
430 ASSERT_TRUE(test_server()->Start()); | 433 ASSERT_TRUE(test_server()->Start()); |
431 ui_test_utils::NavigateToURL(browser(), | 434 ui_test_utils::NavigateToURL(browser(), |
432 test_server()->GetURL(kFullscreenMouseLockHTML)); | 435 test_server()->GetURL(kFullscreenMouseLockHTML)); |
433 | 436 |
434 ASSERT_FALSE(IsMouseLockPermissionRequested()); | 437 ASSERT_FALSE(IsMouseLockPermissionRequested()); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
510 | 513 |
511 GURL url = test_server()->GetURL("simple.html"); | 514 GURL url = test_server()->GetURL("simple.html"); |
512 AddTabAtIndexAndWait(0, url, content::PAGE_TRANSITION_TYPED); | 515 AddTabAtIndexAndWait(0, url, content::PAGE_TRANSITION_TYPED); |
513 | 516 |
514 // Validate that going fullscreen for a URL defaults to asking permision. | 517 // Validate that going fullscreen for a URL defaults to asking permision. |
515 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 518 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
516 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 519 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
517 ASSERT_TRUE(IsFullscreenPermissionRequested()); | 520 ASSERT_TRUE(IsFullscreenPermissionRequested()); |
518 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 521 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
519 } | 522 } |
OLD | NEW |