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

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm

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/cocoa/browser_window_cocoa_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
index 402aa79ada477528e553a584254df890fef5564d..f3e8bc533cb357d7091bd5e9e7bd0c8dd8a55e65 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
@@ -63,6 +63,9 @@ TEST_F(BrowserWindowCocoaTest, TestBookmarkBarVisible) {
- (BOOL)isFullscreen {
return fullscreen_;
}
+- (BOOL)inPresentationMode {
+ return false;
Robert Sesek 2013/01/18 19:41:35 return NO
scheib 2013/01/23 18:13:37 Done.
+}
@end
TEST_F(BrowserWindowCocoaTest, TestFullscreen) {
@@ -74,11 +77,15 @@ TEST_F(BrowserWindowCocoaTest, TestFullscreen) {
scoped_ptr<BrowserWindowCocoa> bwc(new BrowserWindowCocoa(
browser(), static_cast<BrowserWindowController*>(fake_controller.get())));
- EXPECT_FALSE(bwc->IsFullscreen());
- bwc->EnterFullscreen(GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
- EXPECT_TRUE(bwc->IsFullscreen());
+ EXPECT_FALSE(bwc->IsFullscreenWithChrome());
+ EXPECT_FALSE(bwc->IsFullscreenWithoutChrome());
+ bwc->EnterFullscreenWithChrome(GURL(),
+ FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
+ EXPECT_TRUE(bwc->IsFullscreenWithChrome());
+ EXPECT_FALSE(bwc->IsFullscreenWithoutChrome());
bwc->ExitFullscreen();
- EXPECT_FALSE(bwc->IsFullscreen());
+ EXPECT_FALSE(bwc->IsFullscreenWithChrome());
+ EXPECT_FALSE(bwc->IsFullscreenWithoutChrome());
[fake_controller close];
}

Powered by Google App Engine
This is Rietveld 408576698