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

Unified Diff: chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc

Issue 836933005: Refactor fullscreen_controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to TOT 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
index d5558b83d7d654ab8d71d80b0f7d2a8884e957fb..8de336ea297b60ca27b442396667aca8c01ebfd2 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
@@ -185,7 +185,10 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
browser_window->GetNativeWindow());
{
Waiter waiter(browser());
- browser()->fullscreen_controller()->ToggleBrowserFullscreenMode();
+ browser()
+ ->exclusive_access_manager()
+ ->fullscreen_controller()
+ ->ToggleBrowserFullscreenMode();
waiter.Wait(false /* not locked */, true /* full screen */);
EXPECT_TRUE(browser_window->IsFullscreen());
EXPECT_FALSE(window_state->hide_shelf_when_fullscreen());
@@ -208,7 +211,10 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
EXPECT_FALSE(tester->IsLocked());
{
Waiter waiter(browser());
- browser()->fullscreen_controller()->ToggleBrowserFullscreenMode();
+ browser()
+ ->exclusive_access_manager()
+ ->fullscreen_controller()
+ ->ToggleBrowserFullscreenMode();
waiter.Wait(false /* not locked */, false /* fullscreen */);
EXPECT_FALSE(browser_window->IsFullscreen());
}
@@ -220,8 +226,10 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
Waiter waiter(browser());
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
- browser()->fullscreen_controller()->EnterFullscreenModeForTab(
- web_contents, GURL());
+ browser()
+ ->exclusive_access_manager()
+ ->fullscreen_controller()
+ ->EnterFullscreenModeForTab(web_contents, GURL());
waiter.Wait(false /* not locked */, true /* fullscreen */);
EXPECT_TRUE(browser_window->IsFullscreen());
EXPECT_TRUE(window_state->hide_shelf_when_fullscreen());
« no previous file with comments | « no previous file | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698