OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/exclusive_access/fullscreen_controller_test.h" | 5 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
14 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
15 #include "content/public/test/test_navigation_observer.h" | 15 #include "content/public/test/test_navigation_observer.h" |
16 | 16 |
17 using content::WebContents; | 17 using content::WebContents; |
18 | 18 |
19 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] = | 19 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] = |
20 "files/fullscreen_mouselock/fullscreen_mouselock.html"; | 20 "files/fullscreen_mouselock/fullscreen_mouselock.html"; |
21 | 21 |
22 void FullscreenControllerTest::RequestToLockMouse( | 22 void FullscreenControllerTest::RequestToLockMouse( |
23 bool user_gesture, | 23 bool user_gesture, |
24 bool last_unlocked_by_target) { | 24 bool last_unlocked_by_target) { |
25 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 25 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
26 browser()->RequestToLockMouse(tab, user_gesture, | 26 browser()->RequestToLockMouse(tab, user_gesture, |
27 last_unlocked_by_target); | 27 last_unlocked_by_target); |
28 } | 28 } |
29 | 29 |
| 30 FullscreenController* FullscreenControllerTest::GetFullscreenController() { |
| 31 return GetExclusiveAccessManager()->GetFullscreenController(); |
| 32 } |
| 33 |
| 34 ExclusiveAccessManager* FullscreenControllerTest::GetExclusiveAccessManager() { |
| 35 return browser()->GetExclusiveAccessManager(); |
| 36 } |
| 37 |
30 void FullscreenControllerTest::LostMouseLock() { | 38 void FullscreenControllerTest::LostMouseLock() { |
31 browser()->LostMouseLock(); | 39 browser()->LostMouseLock(); |
32 } | 40 } |
33 | 41 |
34 bool FullscreenControllerTest::SendEscapeToFullscreenController() { | 42 bool FullscreenControllerTest::SendEscapeToFullscreenController() { |
35 return browser()->fullscreen_controller()->HandleUserPressedEscape(); | 43 return GetExclusiveAccessManager()->HandleUserPressedEscape(); |
36 } | 44 } |
37 | 45 |
38 bool FullscreenControllerTest::IsFullscreenForBrowser() { | 46 bool FullscreenControllerTest::IsFullscreenForBrowser() { |
39 return browser()->fullscreen_controller()->IsFullscreenForBrowser(); | 47 return GetFullscreenController()->IsFullscreenForBrowser(); |
40 } | 48 } |
41 | 49 |
42 bool FullscreenControllerTest::IsWindowFullscreenForTabOrPending() { | 50 bool FullscreenControllerTest::IsWindowFullscreenForTabOrPending() { |
43 return browser()->fullscreen_controller()-> | 51 return GetFullscreenController()->IsWindowFullscreenForTabOrPending(); |
44 IsWindowFullscreenForTabOrPending(); | |
45 } | 52 } |
46 | 53 |
47 bool FullscreenControllerTest::IsMouseLockPermissionRequested() { | 54 bool FullscreenControllerTest::IsMouseLockPermissionRequested() { |
48 ExclusiveAccessBubbleType type = | 55 ExclusiveAccessBubbleType type = GetExclusiveAccessBubbleType(); |
49 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); | |
50 bool mouse_lock = false; | 56 bool mouse_lock = false; |
51 exclusive_access_bubble::PermissionRequestedByType(type, NULL, &mouse_lock); | 57 exclusive_access_bubble::PermissionRequestedByType(type, NULL, &mouse_lock); |
52 return mouse_lock; | 58 return mouse_lock; |
53 } | 59 } |
54 | 60 |
55 bool FullscreenControllerTest::IsFullscreenPermissionRequested() { | 61 bool FullscreenControllerTest::IsFullscreenPermissionRequested() { |
56 ExclusiveAccessBubbleType type = | 62 ExclusiveAccessBubbleType type = GetExclusiveAccessBubbleType(); |
57 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); | |
58 bool fullscreen = false; | 63 bool fullscreen = false; |
59 exclusive_access_bubble::PermissionRequestedByType(type, &fullscreen, NULL); | 64 exclusive_access_bubble::PermissionRequestedByType(type, &fullscreen, NULL); |
60 return fullscreen; | 65 return fullscreen; |
61 } | 66 } |
62 | 67 |
63 ExclusiveAccessBubbleType | 68 ExclusiveAccessBubbleType |
64 FullscreenControllerTest::GetExclusiveAccessBubbleType() { | 69 FullscreenControllerTest::GetExclusiveAccessBubbleType() { |
65 return browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); | 70 return GetExclusiveAccessManager()->GetExclusiveAccessExitBubbleType(); |
66 } | 71 } |
67 | 72 |
68 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() { | 73 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() { |
69 ExclusiveAccessBubbleType type = | 74 return GetExclusiveAccessBubbleType() != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; |
70 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); | |
71 return type != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; | |
72 } | 75 } |
73 | 76 |
74 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() { | 77 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() { |
75 ExclusiveAccessBubbleType type = | 78 return exclusive_access_bubble::ShowButtonsForType( |
76 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); | 79 GetExclusiveAccessBubbleType()); |
77 return exclusive_access_bubble::ShowButtonsForType(type); | |
78 } | 80 } |
79 | 81 |
80 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() { | 82 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() { |
81 browser()->fullscreen_controller()->OnAcceptFullscreenPermission(); | 83 GetExclusiveAccessManager()->OnAcceptExclusiveAccessPermission(); |
82 } | 84 } |
83 | 85 |
84 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() { | 86 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() { |
85 browser()->fullscreen_controller()->OnDenyFullscreenPermission(); | 87 GetExclusiveAccessManager()->OnDenyExclusiveAccessPermission(); |
86 } | 88 } |
87 | 89 |
88 void FullscreenControllerTest::GoBack() { | 90 void FullscreenControllerTest::GoBack() { |
89 content::TestNavigationObserver observer( | 91 content::TestNavigationObserver observer( |
90 browser()->tab_strip_model()->GetActiveWebContents(), 1); | 92 browser()->tab_strip_model()->GetActiveWebContents(), 1); |
91 chrome::GoBack(browser(), CURRENT_TAB); | 93 chrome::GoBack(browser(), CURRENT_TAB); |
92 observer.Wait(); | 94 observer.Wait(); |
93 } | 95 } |
94 | 96 |
95 void FullscreenControllerTest::Reload() { | 97 void FullscreenControllerTest::Reload() { |
96 content::TestNavigationObserver observer( | 98 content::TestNavigationObserver observer( |
97 browser()->tab_strip_model()->GetActiveWebContents(), 1); | 99 browser()->tab_strip_model()->GetActiveWebContents(), 1); |
98 chrome::Reload(browser(), CURRENT_TAB); | 100 chrome::Reload(browser(), CURRENT_TAB); |
99 observer.Wait(); | 101 observer.Wait(); |
100 } | 102 } |
101 | 103 |
102 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { | 104 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { |
103 browser()->fullscreen_controller()-> | 105 GetFullscreenController()->SetPrivilegedFullscreenForTesting(is_privileged); |
104 SetPrivilegedFullscreenForTesting(is_privileged); | |
105 } | 106 } |
OLD | NEW |