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

Side by Side 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, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/mac/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #import "chrome/browser/ui/cocoa/browser_window_layout.h" 8 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 output.fullscreenBackingBarFrame)); 67 output.fullscreenBackingBarFrame));
68 EXPECT_EQ(527, output.findBarMaxY); 68 EXPECT_EQ(527, output.findBarMaxY);
69 EXPECT_EQ(527, output.fullscreenExitButtonMaxY); 69 EXPECT_EQ(527, output.fullscreenExitButtonMaxY);
70 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 455, 600, 111), output.infoBarFrame)); 70 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 455, 600, 111), output.infoBarFrame));
71 EXPECT_TRUE( 71 EXPECT_TRUE(
72 NSEqualRects(NSMakeRect(0, 0, 600, 44), output.downloadShelfFrame)); 72 NSEqualRects(NSMakeRect(0, 0, 600, 44), output.downloadShelfFrame));
73 EXPECT_TRUE( 73 EXPECT_TRUE(
74 NSEqualRects(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame)); 74 NSEqualRects(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame));
75 } 75 }
76 76
77 TEST_F(BrowserWindowLayoutTest, TestAllViewsFullscreenMenuBarShowing) {
78 // Content view has same size as window in AppKit Fullscreen.
79 [layout setContentViewSize:NSMakeSize(600, 622)];
80 [layout setInAnyFullscreen:YES];
81 [layout setFullscreenSlidingStyle:fullscreen_mac::OMNIBOX_TABS_PRESENT];
82 [layout setFullscreenMenubarOffset:-10];
83 [layout setFullscreenToolbarFraction:0];
84
85 chrome::LayoutOutput output = [layout computeLayout];
86
87 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 575, 600, 37), output.tabStripFrame));
88 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 543, 600, 32), output.toolbarFrame));
89 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 517, 600, 26), output.bookmarkFrame));
90 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 517, 600, 95),
91 output.fullscreenBackingBarFrame));
92 EXPECT_EQ(517, output.findBarMaxY);
93 EXPECT_EQ(517, output.fullscreenExitButtonMaxY);
94 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 445, 600, 111), output.infoBarFrame));
95 EXPECT_TRUE(
96 NSEqualRects(NSMakeRect(0, 0, 600, 44), output.downloadShelfFrame));
97 EXPECT_TRUE(
98 NSEqualRects(NSMakeRect(0, 44, 600, 411), output.contentAreaFrame));
99 }
100
77 TEST_F(BrowserWindowLayoutTest, TestPopupWindow) { 101 TEST_F(BrowserWindowLayoutTest, TestPopupWindow) {
78 [layout setHasTabStrip:NO]; 102 [layout setHasTabStrip:NO];
79 [layout setHasToolbar:NO]; 103 [layout setHasToolbar:NO];
80 [layout setHasLocationBar:YES]; 104 [layout setHasLocationBar:YES];
81 [layout setBookmarkBarHidden:YES]; 105 [layout setBookmarkBarHidden:YES];
82 [layout setHasDownloadShelf:NO]; 106 [layout setHasDownloadShelf:NO];
83 107
84 chrome::LayoutOutput output = [layout computeLayout]; 108 chrome::LayoutOutput output = [layout computeLayout];
85 109
86 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.tabStripFrame)); 110 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.tabStripFrame));
87 EXPECT_TRUE(NSEqualRects(NSMakeRect(1, 568, 598, 32), output.toolbarFrame)); 111 EXPECT_TRUE(NSEqualRects(NSMakeRect(1, 568, 598, 32), output.toolbarFrame));
88 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.bookmarkFrame)); 112 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.bookmarkFrame));
89 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.fullscreenBackingBarFrame)); 113 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.fullscreenBackingBarFrame));
90 EXPECT_EQ(567, output.findBarMaxY); 114 EXPECT_EQ(567, output.findBarMaxY);
91 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 495, 600, 86), output.infoBarFrame)); 115 EXPECT_TRUE(NSEqualRects(NSMakeRect(0, 495, 600, 86), output.infoBarFrame));
92 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.downloadShelfFrame)); 116 EXPECT_TRUE(NSEqualRects(NSZeroRect, output.downloadShelfFrame));
93 EXPECT_TRUE( 117 EXPECT_TRUE(
94 NSEqualRects(NSMakeRect(0, 0, 600, 495), output.contentAreaFrame)); 118 NSEqualRects(NSMakeRect(0, 0, 600, 495), output.contentAreaFrame));
95 } 119 }
OLDNEW
« 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