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

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

Issue 607603003: Mac: Minor fullscreen adjustments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix presentation mode unit test. Created 6 years, 3 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_layout_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm b/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
index 2fb26b4b43f438c060df1f7505ae943a2bff5c9b..927bb204d861b0a8d1cdd75f9262cc96961ab81c 100644
--- a/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
@@ -74,6 +74,30 @@ TEST_F(BrowserWindowLayoutTest, TestAllViewsFullscreen) {
NSEqualRects(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame));
}
+TEST_F(BrowserWindowLayoutTest, TestAllViewsFullscreenMenuBarShowing) {
+ // Content view has same size as window in AppKit Fullscreen.
+ [layout setContentViewSize:NSMakeSize(600, 622)];
+ [layout setInAnyFullscreen:YES];
+ [layout setFullscreenSlidingStyle:fullscreen_mac::OMNIBOX_TABS_PRESENT];
+ [layout setFullscreenMenubarOffset:-10];
+ [layout setFullscreenToolbarFraction:0];
+
+ chrome::LayoutOutput output = [layout computeLayout];
+
+ EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 575, 600, 37), output.tabStripFrame));
+ EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 543, 600, 32), output.toolbarFrame));
+ EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 517, 600, 26), output.bookmarkFrame));
+ EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 517, 600, 95),
+ output.fullscreenBackingBarFrame));
+ EXPECT_EQ(517, output.findBarMaxY);
+ EXPECT_EQ(517, output.fullscreenExitButtonMaxY);
+ EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 445, 600, 111), output.infoBarFrame));
+ EXPECT_TRUE(
+ NSEqualRects(NSMakeRect(0, 0, 600, 44), output.downloadShelfFrame));
+ EXPECT_TRUE(
+ NSEqualRects(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame));
+}
+
TEST_F(BrowserWindowLayoutTest, TestPopupWindow) {
[layout setHasTabStrip:NO];
[layout setHasToolbar:NO];
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_layout.mm ('k') | chrome/browser/ui/cocoa/presentation_mode_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698