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

Side by Side Diff: chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc

Issue 836933005: Refactor fullscreen_controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months 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) 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/exclusive_access_controller_manager .h"
11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 12 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
14 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
15 #include "content/public/test/test_navigation_observer.h" 16 #include "content/public/test/test_navigation_observer.h"
16 17
17 using content::WebContents; 18 using content::WebContents;
18 19
19 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] = 20 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] =
20 "files/fullscreen_mouselock/fullscreen_mouselock.html"; 21 "files/fullscreen_mouselock/fullscreen_mouselock.html";
21 22
22 void FullscreenControllerTest::RequestToLockMouse( 23 void FullscreenControllerTest::RequestToLockMouse(
23 bool user_gesture, 24 bool user_gesture,
24 bool last_unlocked_by_target) { 25 bool last_unlocked_by_target) {
25 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 26 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
26 browser()->RequestToLockMouse(tab, user_gesture, 27 browser()->RequestToLockMouse(tab, user_gesture,
27 last_unlocked_by_target); 28 last_unlocked_by_target);
28 } 29 }
29 30
31 FullscreenController* FullscreenControllerTest::GetFullscreenController() {
32 browser()->GetExclusiveAccessControllerManager()->GetFullscreenController();
33 }
34
30 void FullscreenControllerTest::LostMouseLock() { 35 void FullscreenControllerTest::LostMouseLock() {
31 browser()->LostMouseLock(); 36 browser()->LostMouseLock();
32 } 37 }
33 38
34 bool FullscreenControllerTest::SendEscapeToFullscreenController() { 39 bool FullscreenControllerTest::SendEscapeToFullscreenController() {
35 return browser()->fullscreen_controller()->HandleUserPressedEscape(); 40 return GetFullscreenController()->HandleUserPressedEscape();
36 } 41 }
37 42
38 bool FullscreenControllerTest::IsFullscreenForBrowser() { 43 bool FullscreenControllerTest::IsFullscreenForBrowser() {
39 return browser()->fullscreen_controller()->IsFullscreenForBrowser(); 44 return GetFullscreenController()->IsFullscreenForBrowser();
40 } 45 }
41 46
42 bool FullscreenControllerTest::IsWindowFullscreenForTabOrPending() { 47 bool FullscreenControllerTest::IsWindowFullscreenForTabOrPending() {
43 return browser()->fullscreen_controller()-> 48 return GetFullscreenController()->IsWindowFullscreenForTabOrPending();
44 IsWindowFullscreenForTabOrPending();
45 } 49 }
46 50
47 bool FullscreenControllerTest::IsMouseLockPermissionRequested() { 51 bool FullscreenControllerTest::IsMouseLockPermissionRequested() {
48 ExclusiveAccessBubbleType type = 52 ExclusiveAccessBubbleType type = GetExclusiveAccessBubbleType();
49 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
50 bool mouse_lock = false; 53 bool mouse_lock = false;
51 exclusive_access_bubble::PermissionRequestedByType(type, NULL, &mouse_lock); 54 exclusive_access_bubble::PermissionRequestedByType(type, NULL, &mouse_lock);
52 return mouse_lock; 55 return mouse_lock;
53 } 56 }
54 57
55 bool FullscreenControllerTest::IsFullscreenPermissionRequested() { 58 bool FullscreenControllerTest::IsFullscreenPermissionRequested() {
56 ExclusiveAccessBubbleType type = 59 ExclusiveAccessBubbleType type = GetExclusiveAccessBubbleType();
57 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
58 bool fullscreen = false; 60 bool fullscreen = false;
59 exclusive_access_bubble::PermissionRequestedByType(type, &fullscreen, NULL); 61 exclusive_access_bubble::PermissionRequestedByType(type, &fullscreen, NULL);
60 return fullscreen; 62 return fullscreen;
61 } 63 }
62 64
63 ExclusiveAccessBubbleType 65 ExclusiveAccessBubbleType
64 FullscreenControllerTest::GetExclusiveAccessBubbleType() { 66 FullscreenControllerTest::GetExclusiveAccessBubbleType() {
65 return browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); 67 return browser()
68 ->GetExclusiveAccessControllerManager()
69 ->GetExclusiveAccessBubbleType();
66 } 70 }
67 71
68 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() { 72 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() {
69 ExclusiveAccessBubbleType type = 73 return GetExclusiveAccessBubbleType() != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
70 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
71 return type != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
72 } 74 }
73 75
74 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() { 76 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() {
75 ExclusiveAccessBubbleType type = 77 return exclusive_access_bubble::ShowButtonsForType(
76 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); 78 GetExclusiveAccessBubbleType());
77 return exclusive_access_bubble::ShowButtonsForType(type);
78 } 79 }
79 80
80 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() { 81 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() {
81 browser()->fullscreen_controller()->OnAcceptFullscreenPermission(); 82 browser()
83 ->GetExclusiveAccessControllerManager()
84 ->OnAcceptFullscreenPermission();
82 } 85 }
83 86
84 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() { 87 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() {
85 browser()->fullscreen_controller()->OnDenyFullscreenPermission(); 88 browser()
89 ->GetExclusiveAccessControllerManager()
90 ->OnDenyFullscreenPermission();
86 } 91 }
87 92
88 void FullscreenControllerTest::GoBack() { 93 void FullscreenControllerTest::GoBack() {
89 content::TestNavigationObserver observer( 94 content::TestNavigationObserver observer(
90 browser()->tab_strip_model()->GetActiveWebContents(), 1); 95 browser()->tab_strip_model()->GetActiveWebContents(), 1);
91 chrome::GoBack(browser(), CURRENT_TAB); 96 chrome::GoBack(browser(), CURRENT_TAB);
92 observer.Wait(); 97 observer.Wait();
93 } 98 }
94 99
95 void FullscreenControllerTest::Reload() { 100 void FullscreenControllerTest::Reload() {
96 content::TestNavigationObserver observer( 101 content::TestNavigationObserver observer(
97 browser()->tab_strip_model()->GetActiveWebContents(), 1); 102 browser()->tab_strip_model()->GetActiveWebContents(), 1);
98 chrome::Reload(browser(), CURRENT_TAB); 103 chrome::Reload(browser(), CURRENT_TAB);
99 observer.Wait(); 104 observer.Wait();
100 } 105 }
101 106
102 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { 107 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) {
103 browser()->fullscreen_controller()-> 108 GetFullscreenController()->SetPrivilegedFullscreenForTesting(is_privileged);
104 SetPrivilegedFullscreenForTesting(is_privileged);
105 } 109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698