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

Unified Diff: chrome/browser/ui/fullscreen/fullscreen_controller_test.cc

Issue 10700071: browser: Remove fullscreen functions and have callers call FullscreenController directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/fullscreen/fullscreen_controller_test.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc
index 630082d9d936b93e8cfd01559fb35e639b245e28..2a9ccbb8317fee36cbc9d16bed3eb7cdb640c9b2 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc
@@ -45,7 +45,7 @@ void FullscreenControllerTest::ToggleBrowserFullscreen(bool enter_fullscreen) {
ASSERT_EQ(browser()->window()->IsFullscreen(), !enter_fullscreen);
FullscreenNotificationObserver fullscreen_observer;
- browser()->ToggleFullscreenMode();
+ chrome::ToggleFullscreenMode(browser());
fullscreen_observer.Wait();
ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
@@ -65,20 +65,20 @@ void FullscreenControllerTest::LostMouseLock() {
}
bool FullscreenControllerTest::SendEscapeToFullscreenController() {
- return browser()->fullscreen_controller_->HandleUserPressedEscape();
+ return browser()->fullscreen_controller()->HandleUserPressedEscape();
}
bool FullscreenControllerTest::IsFullscreenForBrowser() {
- return browser()->fullscreen_controller_->IsFullscreenForBrowser();
+ return browser()->fullscreen_controller()->IsFullscreenForBrowser();
}
bool FullscreenControllerTest::IsFullscreenForTabOrPending() {
- return browser()->IsFullscreenForTabOrPending();
+ return browser()->fullscreen_controller()->IsFullscreenForTabOrPending();
}
bool FullscreenControllerTest::IsMouseLockPermissionRequested() {
FullscreenExitBubbleType type =
- browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+ browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
bool mouse_lock = false;
fullscreen_bubble::PermissionRequestedByType(type, NULL, &mouse_lock);
return mouse_lock;
@@ -86,7 +86,7 @@ bool FullscreenControllerTest::IsMouseLockPermissionRequested() {
bool FullscreenControllerTest::IsFullscreenPermissionRequested() {
FullscreenExitBubbleType type =
- browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+ browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
bool fullscreen = false;
fullscreen_bubble::PermissionRequestedByType(type, &fullscreen, NULL);
return fullscreen;
@@ -94,32 +94,33 @@ bool FullscreenControllerTest::IsFullscreenPermissionRequested() {
FullscreenExitBubbleType
FullscreenControllerTest::GetFullscreenExitBubbleType() {
- return browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+ return browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
}
bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() {
FullscreenExitBubbleType type =
- browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+ browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
return type != FEB_TYPE_NONE;
}
bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() {
FullscreenExitBubbleType type =
- browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+ browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
return fullscreen_bubble::ShowButtonsForType(type);
}
void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() {
WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser());
FullscreenExitBubbleType type =
- browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
- browser()->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type);
+ browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
+ browser()->fullscreen_controller()->OnAcceptFullscreenPermission(
+ fullscreen_tab->GetURL(), type);
}
void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() {
FullscreenExitBubbleType type =
- browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
- browser()->OnDenyFullscreenPermission(type);
+ browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
+ browser()->fullscreen_controller()->OnDenyFullscreenPermission(type);
}
void FullscreenControllerTest::AddTabAtIndexAndWait(int index, const GURL& url,

Powered by Google App Engine
This is Rietveld 408576698