chrome/browser/ui/cocoa/browser_window_controller_unittest.mm - Issue 1662783002: Remove HostDesktopType from Browser::CreateParams

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

Issue 1662783002: Remove HostDesktopType from Browser::CreateParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-12

Patch Set: remove desktop_type_ in bookmark_bubble_sign_in_delegate Created 4 years, 10 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm ('k') | chrome/browser/ui/cocoa/cocoa_profile_test.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b98694e3cb56a26c7cee764131443baa99e0f13f..44237b0ef4ae73c288339ef4c975c2eb080912c0 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

@@ -125,9 +125,8 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {

// And make sure a controller for a pop-up window is not normal.

// popup_browser will be owned by its window.

- Browser* popup_browser(new Browser(

- Browser::CreateParams(Browser::TYPE_POPUP, profile(),

- chrome::GetActiveDesktop())));

+ Browser* popup_browser(

+ new Browser(Browser::CreateParams(Browser::TYPE_POPUP, profile())));

NSWindow* cocoaWindow = popup_browser->window()->GetNativeWindow();

BrowserWindowController* controller =

static_cast<BrowserWindowController*>([cocoaWindow windowController]);

@@ -141,8 +140,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::GetActiveDesktop());

+ Browser::CreateParams params(Browser::TYPE_TABBED, profile());

params.initial_bounds = gfx::Rect(0, 0, 50, 50);

Browser* browser = new Browser(params);

NSWindow* cocoaWindow = browser->window()->GetNativeWindow();

@@ -167,8 +165,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::GetActiveDesktop());

+ Browser::CreateParams params(Browser::TYPE_POPUP, profile());

params.initial_bounds = gfx::Rect(0, 0, 50, 50);

Browser* browser = new Browser(params);

NSWindow* cocoaWindow = browser->window()->GetNativeWindow();

@@ -208,8 +205,7 @@ TEST_F(BrowserWindowControllerTest, BookmarkBarControllerIndirection) {

}

TEST_F(BrowserWindowControllerTest, BookmarkBarToggleRespectMinWindowHeight) {

- Browser::CreateParams params(Browser::TYPE_TABBED, profile(),

- chrome::GetActiveDesktop());

+ Browser::CreateParams params(Browser::TYPE_TABBED, profile());

params.initial_bounds = gfx::Rect(0, 0, 50, 280);

Browser* browser = new Browser(params);

NSWindow* cocoaWindow = browser->window()->GetNativeWindow();

@@ -236,8 +232,7 @@ TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) {

scoped_ptr<TestingProfile> incognito_profile(new TestingProfile());

incognito_profile->set_off_the_record(true);

scoped_ptr<Browser> browser(

- new Browser(Browser::CreateParams(incognito_profile.get(),

- chrome::GetActiveDesktop()));

+ new Browser(Browser::CreateParams(incognito_profile.get())));

controller_.reset([[BrowserWindowController alloc]

initWithBrowser:browser.get()

takeOwnership:NO]);