Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Side by Side Diff: chrome/browser/extensions/extension_fullscreen_apitest.cc

Issue 1480183002: Deleted fullscreen virtual methods in BrowserWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More Mac fixes. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
8 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
7 9
8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 10 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
9 ExtensionFullscreenAccessFail) { 11 ExtensionFullscreenAccessFail) {
10 // Test that fullscreen cannot be accessed from an extension without 12 // Test that fullscreen cannot be accessed from an extension without
11 // permission. 13 // permission.
12 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_; 14 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_;
13 } 15 }
14 16
15 #if defined(OS_MACOSX) 17 #if defined(OS_MACOSX)
16 // Fails on MAC: http://crbug.com/480370 18 // Fails on MAC: http://crbug.com/480370
17 #define MAYBE_ExtensionFullscreenAccessPass \ 19 #define MAYBE_ExtensionFullscreenAccessPass \
18 DISABLED_ExtensionFullscreenAccessPass 20 DISABLED_ExtensionFullscreenAccessPass
19 #else 21 #else
20 #define MAYBE_ExtensionFullscreenAccessPass ExtensionFullscreenAccessPass 22 #define MAYBE_ExtensionFullscreenAccessPass ExtensionFullscreenAccessPass
21 #endif // defined(OS_MACOSX) 23 #endif // defined(OS_MACOSX)
22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ExtensionFullscreenAccessPass) { 24 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ExtensionFullscreenAccessPass) {
23 // Test that fullscreen can be accessed from an extension with permission. 25 // Test that fullscreen can be accessed from an extension with permission.
24 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_; 26 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_;
25 } 27 }
26 28
27 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 29 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
28 FocusWindowDoesNotExitFullscreen) { 30 FocusWindowDoesNotExitFullscreen) {
29 browser()->window()->EnterFullscreen( 31 browser()->exclusive_access_manager()->context()->EnterFullscreen(
30 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, 32 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION,
31 false); 33 false);
32 ASSERT_TRUE(browser()->window()->IsFullscreen()); 34 ASSERT_TRUE(browser()->window()->IsFullscreen());
33 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_; 35 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_;
34 ASSERT_TRUE(browser()->window()->IsFullscreen()); 36 ASSERT_TRUE(browser()->window()->IsFullscreen());
35 } 37 }
36 38
37 #if defined(OS_MACOSX) 39 #if defined(OS_MACOSX)
38 // Fails flakily on Mac: http://crbug.com/308041 40 // Fails flakily on Mac: http://crbug.com/308041
39 #define MAYBE_UpdateWindowSizeExitsFullscreen \ 41 #define MAYBE_UpdateWindowSizeExitsFullscreen \
40 DISABLED_UpdateWindowSizeExitsFullscreen 42 DISABLED_UpdateWindowSizeExitsFullscreen
41 #else 43 #else
42 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen 44 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen
43 #endif // defined(OS_MACOSX) 45 #endif // defined(OS_MACOSX)
44 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 46 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
45 MAYBE_UpdateWindowSizeExitsFullscreen) { 47 MAYBE_UpdateWindowSizeExitsFullscreen) {
46 browser()->window()->EnterFullscreen( 48 browser()->exclusive_access_manager()->context()->EnterFullscreen(
47 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, 49 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION,
48 false); 50 false);
49 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; 51 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_;
50 ASSERT_FALSE(browser()->window()->IsFullscreen()); 52 ASSERT_FALSE(browser()->window()->IsFullscreen());
51 } 53 }
52 54
53 #if defined(OS_MACOSX) 55 #if defined(OS_MACOSX)
54 // Fails on MAC: http://crbug.com/480370 56 // Fails on MAC: http://crbug.com/480370
55 #define MAYBE_DisplayModeWindowIsInFullscreen DISABLED_DisplayModeWindowIsInFull screen 57 #define MAYBE_DisplayModeWindowIsInFullscreen DISABLED_DisplayModeWindowIsInFull screen
56 #else 58 #else
57 #define MAYBE_DisplayModeWindowIsInFullscreen DisplayModeWindowIsInFullscreen 59 #define MAYBE_DisplayModeWindowIsInFullscreen DisplayModeWindowIsInFullscreen
58 #endif // defined(OS_MACOSX) 60 #endif // defined(OS_MACOSX)
59 61
60 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 62 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
61 MAYBE_DisplayModeWindowIsInFullscreen) { 63 MAYBE_DisplayModeWindowIsInFullscreen) {
62 ASSERT_TRUE(RunPlatformAppTest("fullscreen/mq_display_mode")) << message_; 64 ASSERT_TRUE(RunPlatformAppTest("fullscreen/mq_display_mode")) << message_;
63 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698