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 "content/public/browser/render_view_host.h" | 9 #include "content/public/browser/render_view_host.h" |
10 #include "content/public/browser/render_widget_host_view.h" | 10 #include "content/public/browser/render_widget_host_view.h" |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 | 195 |
196 // Accept fullscreen and mouse lock. | 196 // Accept fullscreen and mouse lock. |
197 AcceptCurrentFullscreenOrMouseLockRequest(); | 197 AcceptCurrentFullscreenOrMouseLockRequest(); |
198 ASSERT_TRUE(IsMouseLocked()); | 198 ASSERT_TRUE(IsMouseLocked()); |
199 ASSERT_TRUE(IsFullscreenForTabOrPending()); | 199 ASSERT_TRUE(IsFullscreenForTabOrPending()); |
200 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); | 200 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); |
201 } | 201 } |
202 | 202 |
203 // Times out sometimes on Linux. http://crbug.com/135115 | 203 // Times out sometimes on Linux. http://crbug.com/135115 |
204 #if defined(OS_LINUX) | 204 #if defined(OS_LINUX) |
205 #define MAYBE_MouseLockAndFullscreen FLAKY_MouseLockAndFullscreen | 205 #define MAYBE_MouseLockAndFullscreen DISABLED_MouseLockAndFullscreen |
206 #else | 206 #else |
207 #define MAYBE_MouseLockAndFullscreen MouseLockAndFullscreen | 207 #define MAYBE_MouseLockAndFullscreen MouseLockAndFullscreen |
208 #endif | 208 #endif |
209 // Tests mouse lock then fullscreen in same request. | 209 // Tests mouse lock then fullscreen in same request. |
210 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 210 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
211 MAYBE_MouseLockAndFullscreen) { | 211 MAYBE_MouseLockAndFullscreen) { |
212 ASSERT_TRUE(test_server()->Start()); | 212 ASSERT_TRUE(test_server()->Start()); |
213 ui_test_utils::NavigateToURL(browser(), | 213 ui_test_utils::NavigateToURL(browser(), |
214 test_server()->GetURL(kFullscreenMouseLockHTML)); | 214 test_server()->GetURL(kFullscreenMouseLockHTML)); |
215 | 215 |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 | 505 |
506 GURL url = test_server()->GetURL("simple.html"); | 506 GURL url = test_server()->GetURL("simple.html"); |
507 AddTabAtIndexAndWait(0, url, content::PAGE_TRANSITION_TYPED); | 507 AddTabAtIndexAndWait(0, url, content::PAGE_TRANSITION_TYPED); |
508 | 508 |
509 // Validate that going fullscreen for a URL defaults to asking permision. | 509 // Validate that going fullscreen for a URL defaults to asking permision. |
510 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 510 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
511 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 511 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
512 ASSERT_TRUE(IsFullscreenPermissionRequested()); | 512 ASSERT_TRUE(IsFullscreenPermissionRequested()); |
513 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 513 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
514 } | 514 } |
OLD | NEW |