| 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. |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 // Fails flakily: http://crbug.com/308041 | 31 // Fails flakily: http://crbug.com/308041 |
| 32 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 32 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
| 33 DISABLED_UpdateWindowSizeExitsFullscreen) { | 33 DISABLED_UpdateWindowSizeExitsFullscreen) { |
| 34 browser()->window()->EnterFullscreen( | 34 browser()->window()->EnterFullscreen( |
| 35 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, | 35 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, |
| 36 false); | 36 false); |
| 37 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; | 37 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; |
| 38 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 38 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 39 } | 39 } |
| 40 |
| 41 #if defined(OS_MACOSX) |
| 42 // Fails on MAC: http://crbug.com/480370 |
| 43 #define MAYBE_DisplayModeWindowIsInFullscreen DISABLED_DisplayModeWindowIsInFull
screen |
| 44 #else |
| 45 #define MAYBE_DisplayModeWindowIsInFullscreen DisplayModeWindowIsInFullscreen |
| 46 #endif // defined(OS_MACOSX) |
| 47 |
| 48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
| 49 MAYBE_DisplayModeWindowIsInFullscreen) { |
| 50 ASSERT_TRUE(RunPlatformAppTest("fullscreen/mq_display_mode")) << message_; |
| 51 } |
| OLD | NEW |