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 can be accessed from an extension without permission. |
11 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_; | 11 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_; |
12 } | 12 } |
13 | 13 |
14 // Disabled, a user gesture is required for fullscreen. http://crbug.com/174178 | 14 // Disabled, a user gesture is required for fullscreen. http://crbug.com/174178 |
15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
16 DISABLED_ExtensionFullscreenAccessPass) { | 16 DISABLED_ExtensionFullscreenAccessPass) { |
17 // Test that fullscreen can be accessed from an extension with permission. | 17 // Test that fullscreen can be accessed from an extension with permission. |
18 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_; | 18 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_; |
19 } | 19 } |
20 | 20 |
21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
22 FocusWindowDoesNotExitFullscreen) { | 22 FocusWindowDoesNotExitFullscreen) { |
23 browser()->window()->EnterFullscreen( | 23 browser()->window()->EnterFullscreen( |
24 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, false); | 24 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, |
| 25 false); |
25 bool is_fullscreen = browser()->window()->IsFullscreen(); | 26 bool is_fullscreen = browser()->window()->IsFullscreen(); |
26 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_; | 27 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_; |
27 ASSERT_EQ(is_fullscreen, browser()->window()->IsFullscreen()); | 28 ASSERT_EQ(is_fullscreen, browser()->window()->IsFullscreen()); |
28 } | 29 } |
29 | 30 |
30 // Fails flakily: http://crbug.com/308041 | 31 // Fails flakily: http://crbug.com/308041 |
31 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 32 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
32 DISABLED_UpdateWindowSizeExitsFullscreen) { | 33 DISABLED_UpdateWindowSizeExitsFullscreen) { |
33 browser()->window()->EnterFullscreen( | 34 browser()->window()->EnterFullscreen( |
34 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, false); | 35 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, |
| 36 false); |
35 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; | 37 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; |
36 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 38 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
37 } | 39 } |
OLD | NEW |