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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index ce77ea08a64e15c3007b825d42ba5b45dbb9573d..ca362a08797e45bc6f2b56bd2ac3c58195d8fd1a 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -140,7 +140,7 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {
// popup_browser will be owned by its window.
Browser* popup_browser(new Browser(
Browser::CreateParams(Browser::TYPE_POPUP, profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE)));
+ chrome::GetActiveDesktop())));
NSWindow *cocoaWindow = popup_browser->window()->GetNativeWindow();
BrowserWindowController* controller =
static_cast<BrowserWindowController*>([cocoaWindow windowController]);
@@ -155,7 +155,7 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {
TEST_F(BrowserWindowControllerTest, TestSetBounds) {
// Create a normal browser with bounds smaller than the minimum.
Browser::CreateParams params(Browser::TYPE_TABBED, profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ chrome::GetActiveDesktop());
params.initial_bounds = gfx::Rect(0, 0, 50, 50);
Browser* browser = new Browser(params);
NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
@@ -181,7 +181,7 @@ TEST_F(BrowserWindowControllerTest, TestSetBounds) {
TEST_F(BrowserWindowControllerTest, TestSetBoundsPopup) {
// Create a popup with bounds smaller than the minimum.
Browser::CreateParams params(Browser::TYPE_POPUP, profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ chrome::GetActiveDesktop());
params.initial_bounds = gfx::Rect(0, 0, 50, 50);
Browser* browser = new Browser(params);
NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
@@ -228,7 +228,7 @@ TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) {
incognito_profile->set_off_the_record(true);
scoped_ptr<Browser> browser(
new Browser(Browser::CreateParams(incognito_profile.get(),
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ chrome::GetActiveDesktop()));
controller_.reset([[BrowserWindowController alloc]
initWithBrowser:browser.get()
takeOwnership:NO]);
« 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