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

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

Issue 12018007: Refactor BrowserWindow fullscreen and presentation on Mac to be consistent with other platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge TOT Created 7 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
Index: chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
index 85c2b77250fbe05db5f9b6f2594d14214217fd48..7413e7abfdef66a7bb43723414146b6e24f8e652 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
@@ -368,11 +368,13 @@ IN_PROC_BROWSER_TEST_F(
{
FullscreenNotificationObserver fullscreen_observer;
EXPECT_FALSE(browser()->window()->IsFullscreen());
- EXPECT_FALSE(browser()->window()->InPresentationMode());
+ EXPECT_FALSE(browser()->window()->IsFullscreenWithChrome());
+ EXPECT_FALSE(browser()->window()->IsFullscreenWithoutChrome());
browser()->ToggleFullscreenModeForTab(tab, true);
fullscreen_observer.Wait();
ASSERT_TRUE(browser()->window()->IsFullscreen());
Robert Sesek 2013/01/18 19:41:35 Why are these ASSERTs?
scheib 2013/01/23 18:13:37 Done, changed to EXPECT.
- ASSERT_TRUE(browser()->window()->InPresentationMode());
+ ASSERT_FALSE(browser()->window()->IsFullscreenWithChrome());
+ ASSERT_TRUE(browser()->window()->IsFullscreenWithoutChrome());
}
{
@@ -380,7 +382,8 @@ IN_PROC_BROWSER_TEST_F(
browser()->TogglePresentationMode();
fullscreen_observer.Wait();
ASSERT_FALSE(browser()->window()->IsFullscreen());
- ASSERT_FALSE(browser()->window()->InPresentationMode());
+ ASSERT_FALSE(browser()->window()->IsFullscreenWithChrome());
+ ASSERT_FALSE(browser()->window()->IsFullscreenWithoutChrome());
}
if (base::mac::IsOSLionOrLater()) {
@@ -390,7 +393,8 @@ IN_PROC_BROWSER_TEST_F(
chrome::ToggleFullscreenMode(browser());
fullscreen_observer.Wait();
ASSERT_TRUE(browser()->window()->IsFullscreen());
- ASSERT_FALSE(browser()->window()->InPresentationMode());
+ ASSERT_TRUE(browser()->window()->IsFullscreenWithChrome());
+ ASSERT_FALSE(browser()->window()->IsFullscreenWithoutChrome());
}
}
#endif

Powered by Google App Engine
This is Rietveld 408576698