OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 FullscreenWithinTab_EscapeKeyExitsFullscreen) { | 297 FullscreenWithinTab_EscapeKeyExitsFullscreen) { |
298 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 298 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
299 StartFakingTabCapture(); | 299 StartFakingTabCapture(); |
300 ASSERT_TRUE(LaunchFlashFullscreen()); | 300 ASSERT_TRUE(LaunchFlashFullscreen()); |
301 content::WebContents* const first_tab_contents = GetActiveWebContents(); | 301 content::WebContents* const first_tab_contents = GetActiveWebContents(); |
302 EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true)); | 302 EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true)); |
303 PressEscape(); | 303 PressEscape(); |
304 EXPECT_TRUE(ObserveTabIsInFullscreen(false)); | 304 EXPECT_TRUE(ObserveTabIsInFullscreen(false)); |
305 } | 305 } |
306 | 306 |
| 307 // Flaky on Linux, see https://crbug.com/648406. |
| 308 #if defined(OS_LINUX) |
| 309 #define MAYBE_FullscreenFromSubframe DISABLED_FullscreenFromSubframe |
| 310 #else |
| 311 #define MAYBE_FullscreenFromSubframe FullscreenFromSubframe |
| 312 #endif |
307 IN_PROC_BROWSER_TEST_F(FlashFullscreenInteractiveBrowserTest, | 313 IN_PROC_BROWSER_TEST_F(FlashFullscreenInteractiveBrowserTest, |
308 FullscreenFromSubframe) { | 314 MAYBE_FullscreenFromSubframe) { |
309 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 315 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
310 StartFakingTabCapture(); | 316 StartFakingTabCapture(); |
311 ASSERT_TRUE(LaunchFlashFullscreenInSubframe()); | 317 ASSERT_TRUE(LaunchFlashFullscreenInSubframe()); |
312 content::WebContents* const first_tab_contents = GetActiveWebContents(); | 318 content::WebContents* const first_tab_contents = GetActiveWebContents(); |
313 EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true)); | 319 EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true)); |
314 PressEscape(); | 320 PressEscape(); |
315 EXPECT_TRUE(ObserveTabIsInFullscreen(false)); | 321 EXPECT_TRUE(ObserveTabIsInFullscreen(false)); |
316 } | 322 } |
317 | 323 |
318 // This tests that browser UI focus behavior is correct when switching between | 324 // This tests that browser UI focus behavior is correct when switching between |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 ASSERT_TRUE(ObserveFlashFillColor(SK_ColorRED)); | 397 ASSERT_TRUE(ObserveFlashFillColor(SK_ColorRED)); |
392 PressSpacebar(); | 398 PressSpacebar(); |
393 ASSERT_TRUE(ObserveFlashFillColor(SK_ColorBLUE)); | 399 ASSERT_TRUE(ObserveFlashFillColor(SK_ColorBLUE)); |
394 | 400 |
395 // Test that the Escape key is handled as an exit fullscreen command while the | 401 // Test that the Escape key is handled as an exit fullscreen command while the |
396 // Flash widget has the focus. | 402 // Flash widget has the focus. |
397 EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true)); | 403 EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true)); |
398 PressEscape(); | 404 PressEscape(); |
399 EXPECT_TRUE(ObserveTabIsInFullscreen(false)); | 405 EXPECT_TRUE(ObserveTabIsInFullscreen(false)); |
400 } | 406 } |
OLD | NEW |