OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
6 #include "chrome/browser/ui/browser_window.h" | 6 #include "chrome/browser/ui/browser_window.h" |
7 | 7 |
8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
9 ExtensionFullscreenAccessFail) { | 9 ExtensionFullscreenAccessFail) { |
10 // Test that fullscreen can be accessed from an extension without permission. | 10 // Test that fullscreen cannot be accessed from an extension without |
| 11 // permission. |
11 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_; | 12 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_; |
12 } | 13 } |
13 | 14 |
14 // Disabled, a user gesture is required for fullscreen. http://crbug.com/174178 | 15 #if defined(OS_MACOSX) |
15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 16 // Fails on MAC: http://crbug.com/480370 |
16 DISABLED_ExtensionFullscreenAccessPass) { | 17 #define MAYBE_ExtensionFullscreenAccessPass \ |
| 18 DISABLED_ExtensionFullscreenAccessPass |
| 19 #else |
| 20 #define MAYBE_ExtensionFullscreenAccessPass ExtensionFullscreenAccessPass |
| 21 #endif // defined(OS_MACOSX) |
| 22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ExtensionFullscreenAccessPass) { |
17 // Test that fullscreen can be accessed from an extension with permission. | 23 // Test that fullscreen can be accessed from an extension with permission. |
18 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_; | 24 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_; |
19 } | 25 } |
20 | 26 |
21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 27 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
22 FocusWindowDoesNotExitFullscreen) { | 28 FocusWindowDoesNotExitFullscreen) { |
23 browser()->window()->EnterFullscreen( | 29 browser()->window()->EnterFullscreen( |
24 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, | 30 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, |
25 false); | 31 false); |
26 bool is_fullscreen = browser()->window()->IsFullscreen(); | 32 bool is_fullscreen = browser()->window()->IsFullscreen(); |
(...skipping 15 matching lines...) Expand all Loading... |
42 // Fails on MAC: http://crbug.com/480370 | 48 // Fails on MAC: http://crbug.com/480370 |
43 #define MAYBE_DisplayModeWindowIsInFullscreen DISABLED_DisplayModeWindowIsInFull
screen | 49 #define MAYBE_DisplayModeWindowIsInFullscreen DISABLED_DisplayModeWindowIsInFull
screen |
44 #else | 50 #else |
45 #define MAYBE_DisplayModeWindowIsInFullscreen DisplayModeWindowIsInFullscreen | 51 #define MAYBE_DisplayModeWindowIsInFullscreen DisplayModeWindowIsInFullscreen |
46 #endif // defined(OS_MACOSX) | 52 #endif // defined(OS_MACOSX) |
47 | 53 |
48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 54 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
49 MAYBE_DisplayModeWindowIsInFullscreen) { | 55 MAYBE_DisplayModeWindowIsInFullscreen) { |
50 ASSERT_TRUE(RunPlatformAppTest("fullscreen/mq_display_mode")) << message_; | 56 ASSERT_TRUE(RunPlatformAppTest("fullscreen/mq_display_mode")) << message_; |
51 } | 57 } |
OLD | NEW |