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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

Issue 16174003: Make all tests use GetActiveDesktop() instead of hardcoding HOST_DESKTOP_TYPE_NATIVE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include "base/mac/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #import "base/memory/scoped_nsobject.h" 8 #import "base/memory/scoped_nsobject.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 // Make sure a normal BrowserWindowController is, uh, normal. 133 // Make sure a normal BrowserWindowController is, uh, normal.
134 EXPECT_TRUE([controller_ isTabbedWindow]); 134 EXPECT_TRUE([controller_ isTabbedWindow]);
135 EXPECT_TRUE([controller_ hasTabStrip]); 135 EXPECT_TRUE([controller_ hasTabStrip]);
136 EXPECT_FALSE([controller_ hasTitleBar]); 136 EXPECT_FALSE([controller_ hasTitleBar]);
137 EXPECT_TRUE([controller_ isBookmarkBarVisible]); 137 EXPECT_TRUE([controller_ isBookmarkBarVisible]);
138 138
139 // And make sure a controller for a pop-up window is not normal. 139 // And make sure a controller for a pop-up window is not normal.
140 // popup_browser will be owned by its window. 140 // popup_browser will be owned by its window.
141 Browser* popup_browser(new Browser( 141 Browser* popup_browser(new Browser(
142 Browser::CreateParams(Browser::TYPE_POPUP, profile(), 142 Browser::CreateParams(Browser::TYPE_POPUP, profile(),
143 chrome::HOST_DESKTOP_TYPE_NATIVE))); 143 chrome::GetActiveDesktop())));
144 NSWindow *cocoaWindow = popup_browser->window()->GetNativeWindow(); 144 NSWindow *cocoaWindow = popup_browser->window()->GetNativeWindow();
145 BrowserWindowController* controller = 145 BrowserWindowController* controller =
146 static_cast<BrowserWindowController*>([cocoaWindow windowController]); 146 static_cast<BrowserWindowController*>([cocoaWindow windowController]);
147 ASSERT_TRUE([controller isKindOfClass:[BrowserWindowController class]]); 147 ASSERT_TRUE([controller isKindOfClass:[BrowserWindowController class]]);
148 EXPECT_FALSE([controller isTabbedWindow]); 148 EXPECT_FALSE([controller isTabbedWindow]);
149 EXPECT_FALSE([controller hasTabStrip]); 149 EXPECT_FALSE([controller hasTabStrip]);
150 EXPECT_TRUE([controller hasTitleBar]); 150 EXPECT_TRUE([controller hasTitleBar]);
151 EXPECT_FALSE([controller isBookmarkBarVisible]); 151 EXPECT_FALSE([controller isBookmarkBarVisible]);
152 [controller close]; 152 [controller close];
153 } 153 }
154 154
155 TEST_F(BrowserWindowControllerTest, TestSetBounds) { 155 TEST_F(BrowserWindowControllerTest, TestSetBounds) {
156 // Create a normal browser with bounds smaller than the minimum. 156 // Create a normal browser with bounds smaller than the minimum.
157 Browser::CreateParams params(Browser::TYPE_TABBED, profile(), 157 Browser::CreateParams params(Browser::TYPE_TABBED, profile(),
158 chrome::HOST_DESKTOP_TYPE_NATIVE); 158 chrome::GetActiveDesktop());
159 params.initial_bounds = gfx::Rect(0, 0, 50, 50); 159 params.initial_bounds = gfx::Rect(0, 0, 50, 50);
160 Browser* browser = new Browser(params); 160 Browser* browser = new Browser(params);
161 NSWindow *cocoaWindow = browser->window()->GetNativeWindow(); 161 NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
162 BrowserWindowController* controller = 162 BrowserWindowController* controller =
163 static_cast<BrowserWindowController*>([cocoaWindow windowController]); 163 static_cast<BrowserWindowController*>([cocoaWindow windowController]);
164 164
165 ASSERT_TRUE([controller isTabbedWindow]); 165 ASSERT_TRUE([controller isTabbedWindow]);
166 BrowserWindow* browser_window = [controller browserWindow]; 166 BrowserWindow* browser_window = [controller browserWindow];
167 EXPECT_EQ(browser_window, browser->window()); 167 EXPECT_EQ(browser_window, browser->window());
168 gfx::Rect bounds = browser_window->GetBounds(); 168 gfx::Rect bounds = browser_window->GetBounds();
169 EXPECT_EQ(400, bounds.width()); 169 EXPECT_EQ(400, bounds.width());
170 EXPECT_EQ(272, bounds.height()); 170 EXPECT_EQ(272, bounds.height());
171 171
172 // Try to set the bounds smaller than the minimum. 172 // Try to set the bounds smaller than the minimum.
173 browser_window->SetBounds(gfx::Rect(0, 0, 50, 50)); 173 browser_window->SetBounds(gfx::Rect(0, 0, 50, 50));
174 bounds = browser_window->GetBounds(); 174 bounds = browser_window->GetBounds();
175 EXPECT_EQ(400, bounds.width()); 175 EXPECT_EQ(400, bounds.width());
176 EXPECT_EQ(272, bounds.height()); 176 EXPECT_EQ(272, bounds.height());
177 177
178 [controller close]; 178 [controller close];
179 } 179 }
180 180
181 TEST_F(BrowserWindowControllerTest, TestSetBoundsPopup) { 181 TEST_F(BrowserWindowControllerTest, TestSetBoundsPopup) {
182 // Create a popup with bounds smaller than the minimum. 182 // Create a popup with bounds smaller than the minimum.
183 Browser::CreateParams params(Browser::TYPE_POPUP, profile(), 183 Browser::CreateParams params(Browser::TYPE_POPUP, profile(),
184 chrome::HOST_DESKTOP_TYPE_NATIVE); 184 chrome::GetActiveDesktop());
185 params.initial_bounds = gfx::Rect(0, 0, 50, 50); 185 params.initial_bounds = gfx::Rect(0, 0, 50, 50);
186 Browser* browser = new Browser(params); 186 Browser* browser = new Browser(params);
187 NSWindow *cocoaWindow = browser->window()->GetNativeWindow(); 187 NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
188 BrowserWindowController* controller = 188 BrowserWindowController* controller =
189 static_cast<BrowserWindowController*>([cocoaWindow windowController]); 189 static_cast<BrowserWindowController*>([cocoaWindow windowController]);
190 190
191 ASSERT_FALSE([controller isTabbedWindow]); 191 ASSERT_FALSE([controller isTabbedWindow]);
192 BrowserWindow* browser_window = [controller browserWindow]; 192 BrowserWindow* browser_window = [controller browserWindow];
193 EXPECT_EQ(browser_window, browser->window()); 193 EXPECT_EQ(browser_window, browser->window());
194 gfx::Rect bounds = browser_window->GetBounds(); 194 gfx::Rect bounds = browser_window->GetBounds();
(...skipping 26 matching lines...) Expand all
221 } 221 }
222 222
223 #if 0 223 #if 0
224 // TODO(jrg): This crashes trying to create the BookmarkBarController, adding 224 // TODO(jrg): This crashes trying to create the BookmarkBarController, adding
225 // an observer to the BookmarkModel. 225 // an observer to the BookmarkModel.
226 TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) { 226 TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) {
227 scoped_ptr<TestingProfile> incognito_profile(new TestingProfile()); 227 scoped_ptr<TestingProfile> incognito_profile(new TestingProfile());
228 incognito_profile->set_off_the_record(true); 228 incognito_profile->set_off_the_record(true);
229 scoped_ptr<Browser> browser( 229 scoped_ptr<Browser> browser(
230 new Browser(Browser::CreateParams(incognito_profile.get(), 230 new Browser(Browser::CreateParams(incognito_profile.get(),
231 chrome::HOST_DESKTOP_TYPE_NATIVE)); 231 chrome::GetActiveDesktop()));
232 controller_.reset([[BrowserWindowController alloc] 232 controller_.reset([[BrowserWindowController alloc]
233 initWithBrowser:browser.get() 233 initWithBrowser:browser.get()
234 takeOwnership:NO]); 234 takeOwnership:NO]);
235 235
236 NSRect tabFrame = [[controller_ tabStripView] frame]; 236 NSRect tabFrame = [[controller_ tabStripView] frame];
237 [controller_ installIncognitoBadge]; 237 [controller_ installIncognitoBadge];
238 NSRect newTabFrame = [[controller_ tabStripView] frame]; 238 NSRect newTabFrame = [[controller_ tabStripView] frame];
239 EXPECT_GT(tabFrame.size.width, newTabFrame.size.width); 239 EXPECT_GT(tabFrame.size.width, newTabFrame.size.width);
240 240
241 controller_.release(); 241 controller_.release();
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 testFullscreenWindow_.reset( 899 testFullscreenWindow_.reset(
900 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) 900 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
901 styleMask:NSBorderlessWindowMask 901 styleMask:NSBorderlessWindowMask
902 backing:NSBackingStoreBuffered 902 backing:NSBackingStoreBuffered
903 defer:NO]); 903 defer:NO]);
904 return testFullscreenWindow_.get(); 904 return testFullscreenWindow_.get();
905 } 905 }
906 @end 906 @end
907 907
908 /* TODO(???): test other methods of BrowserWindowController */ 908 /* TODO(???): test other methods of BrowserWindowController */
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm ('k') | chrome/browser/ui/cocoa/cocoa_profile_test.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698