chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc - Issue 12018007: Refactor BrowserWindow fullscreen and presentation on Mac to be consistent with other platforms.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « chrome/browser/ui/fullscreen/fullscreen_controller.cc ('k') | chrome/browser/ui/fullscreen/fullscreen_controller_state_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..d46a970468d3a002d96d256918e76ad63adb55c1 100644

--- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc

+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc

@@ -368,19 +368,22 @@ 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());

- ASSERT_TRUE(browser()->window()->InPresentationMode());

+ EXPECT_TRUE(browser()->window()->IsFullscreen());

+ EXPECT_FALSE(browser()->window()->IsFullscreenWithChrome());

+ EXPECT_TRUE(browser()->window()->IsFullscreenWithoutChrome());

}

{

FullscreenNotificationObserver fullscreen_observer;

browser()->TogglePresentationMode();

fullscreen_observer.Wait();

- ASSERT_FALSE(browser()->window()->IsFullscreen());

- ASSERT_FALSE(browser()->window()->InPresentationMode());

+ EXPECT_FALSE(browser()->window()->IsFullscreen());

+ EXPECT_FALSE(browser()->window()->IsFullscreenWithChrome());

+ EXPECT_FALSE(browser()->window()->IsFullscreenWithoutChrome());

}

if (base::mac::IsOSLionOrLater()) {

@@ -389,8 +392,9 @@ IN_PROC_BROWSER_TEST_F(

FullscreenNotificationObserver fullscreen_observer;

chrome::ToggleFullscreenMode(browser());

fullscreen_observer.Wait();

- ASSERT_TRUE(browser()->window()->IsFullscreen());

- ASSERT_FALSE(browser()->window()->InPresentationMode());

+ EXPECT_TRUE(browser()->window()->IsFullscreen());

+ EXPECT_TRUE(browser()->window()->IsFullscreenWithChrome());

+ EXPECT_FALSE(browser()->window()->IsFullscreenWithoutChrome());

}

#endif