Remove HostDesktopType from Browser::CreateParams
[email protected]
BUG=558054
Review URL: https://codereview.chromium.org/1662783002
Cr-Commit-Position: refs/heads/master@{#374431}
diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc
index 1c386499..c84f4d5f 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc
@@ -84,7 +84,7 @@
bool incognito) {
Profile* window_profile = incognito ?
profile->GetOffTheRecordProfile() : profile;
- chrome::NewEmptyWindow(window_profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
+ chrome::NewEmptyWindow(window_profile);
}
void AppListControllerDelegateImpl::OpenURL(Profile* profile,
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index 820cb5e8..ba44efb2 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -585,9 +585,7 @@
}
void AppListViewDelegate::OpenHelp() {
- chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(
- controller_->GetAppListWindow());
- chrome::ScopedTabbedBrowserDisplayer displayer(profile_, desktop);
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
content::OpenURLParams params(GURL(chrome::kAppLauncherHelpURL),
content::Referrer(),
NEW_FOREGROUND_TAB,
diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc
index 68e9a07..a5a71b42 100644
--- a/chrome/browser/ui/app_list/start_page_service.cc
+++ b/chrome/browser/ui/app_list/start_page_service.cc
@@ -180,8 +180,7 @@
const gfx::Rect& initial_pos,
bool user_gesture,
bool* was_blocked) override {
- chrome::ScopedTabbedBrowserDisplayer displayer(
- profile_, chrome::GetActiveDesktop());
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
// Force all links to open in a new tab, even if they were trying to open a
// new window.
disposition =
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index aebb117..018119d9 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -252,7 +252,7 @@
return;
}
chrome::ScopedTabbedBrowserDisplayer displayer(
- Profile::FromBrowserContext(context), chrome::GetActiveDesktop());
+ Profile::FromBrowserContext(context));
// Force all links to open in a new tab, even if they were trying to open a
// new window.
disposition =
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index 7669767..43f33971 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -158,11 +158,8 @@
// 3) Hosted apps.
Browser::CreateParams browser_create_params(
- Browser::CreateParams::CreateForApp("Test",
- true /* trusted_source */,
- gfx::Rect(),
- browser()->profile(),
- chrome::HOST_DESKTOP_TYPE_ASH));
+ Browser::CreateParams::CreateForApp("Test", true /* trusted_source */,
+ gfx::Rect(), browser()->profile()));
Browser* app_host_browser = new Browser(browser_create_params);
ASSERT_TRUE(app_host_browser->is_app());
@@ -181,8 +178,8 @@
EXPECT_TRUE(IsInitialShowState(window_state));
// 4) Popup browser windows.
- browser_create_params = Browser::CreateParams(
- Browser::TYPE_POPUP, browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ browser_create_params =
+ Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile());
Browser* popup_browser = new Browser(browser_create_params);
ASSERT_TRUE(popup_browser->is_type_popup());
ASSERT_FALSE(popup_browser->is_app());
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate.cc b/chrome/browser/ui/ash/chrome_new_window_delegate.cc
index 65fee13..8938afc5 100644
--- a/chrome/browser/ui/ash/chrome_new_window_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_delegate.cc
@@ -88,7 +88,7 @@
// Display a browser, setting the focus to the location bar after it is shown.
{
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile());
browser = displayer.browser();
chrome::NewTab(browser);
}
@@ -98,9 +98,8 @@
void ChromeNewWindowDelegate::NewWindow(bool is_incognito) {
Profile* profile = ProfileManager::GetActiveUserProfile();
- chrome::NewEmptyWindow(
- is_incognito ? profile->GetOffTheRecordProfile() : profile,
- chrome::HOST_DESKTOP_TYPE_ASH);
+ chrome::NewEmptyWindow(is_incognito ? profile->GetOffTheRecordProfile()
+ : profile);
}
void ChromeNewWindowDelegate::RestoreTab() {
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc
index 95633f6b..9c5ca6d 100644
--- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc
@@ -56,9 +56,7 @@
profile);
if (!crosh_url.is_valid())
return;
- chrome::ScopedTabbedBrowserDisplayer displayer(
- profile,
- chrome::HOST_DESKTOP_TYPE_ASH);
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile);
Browser* browser = displayer.browser();
content::WebContents* page = browser->OpenURL(
content::OpenURLParams(crosh_url,
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index a130e0c..888ed53 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -170,8 +170,7 @@
Browser* browser = chrome::FindTabbedBrowser(profile, false);
if (!browser) {
- browser = new Browser(
- Browser::CreateParams(profile, chrome::HOST_DESKTOP_TYPE_ASH));
+ browser = new Browser(Browser::CreateParams(profile));
browser->window()->Show();
}
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index abc84ab9..7bcee15 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -225,8 +225,7 @@
}
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile());
chrome::AddTabAt(displayer.browser(), GURL(), -1, true);
}
break;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index ce82d55..dd9c48e 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -955,13 +955,12 @@
void ChromeLauncherController::CreateNewWindow() {
// Use the currently active user.
- chrome::NewEmptyWindow(profile_, chrome::HOST_DESKTOP_TYPE_ASH);
+ chrome::NewEmptyWindow(profile_);
}
void ChromeLauncherController::CreateNewIncognitoWindow() {
// Use the currently active user.
- chrome::NewEmptyWindow(profile_->GetOffTheRecordProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ chrome::NewEmptyWindow(profile_->GetOffTheRecordProfile());
}
void ChromeLauncherController::PersistPinnedState() {
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index 3273dfb..d6fbec0 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -936,7 +936,7 @@
content::WindowedNotificationObserver open_observer(
chrome::NOTIFICATION_BROWSER_WINDOW_READY,
content::NotificationService::AllSources());
- chrome::NewEmptyWindow(browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ chrome::NewEmptyWindow(browser()->profile());
open_observer.Wait();
Browser* browser2 = content::Source<Browser>(open_observer.source()).ptr();
aura::Window* window2 = browser2->window()->GetNativeWindow();
@@ -1605,8 +1605,7 @@
ash::ShelfID shortcut_id = CreateShortcut("app1");
// Create a new browser - without activating it - and load an "app" into it.
- Browser::CreateParams params =
- Browser::CreateParams(profile(), chrome::GetActiveDesktop());
+ Browser::CreateParams params = Browser::CreateParams(profile());
params.initial_show_state = ui::SHOW_STATE_INACTIVE;
Browser* browser2 = new Browser(params);
controller_->SetRefocusURLPatternForTest(
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 63b1f27..28bfc32 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -698,12 +698,9 @@
aura::client::ParentWindowWithContext(native_window_.get(),
ash::Shell::GetPrimaryRootWindow(),
gfx::Rect(10, 10, 20, 30));
- Browser::CreateParams params =
- Browser::CreateParams::CreateForApp(kCrxAppPrefix + app_name,
- true /* trusted_source */,
- gfx::Rect(),
- profile,
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params = Browser::CreateParams::CreateForApp(
+ kCrxAppPrefix + app_name, true /* trusted_source */, gfx::Rect(),
+ profile);
params.window = this;
browser_.reset(new Browser(params));
chrome::AddTabAt(browser_.get(), GURL(), 0, true);
@@ -1542,7 +1539,7 @@
multi_user_util::GetAccountIdFromProfile(profile());
// Create a browser window with a native window for the current user.
- Browser::CreateParams params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params(profile());
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, ¶ms));
BrowserWindow* browser_window = browser->window();
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index d20b66a..b42266d 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -485,7 +485,7 @@
void SystemTrayDelegateChromeOS::ShowChromeSlow() {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetPrimaryUserProfile());
chrome::ShowSlow(displayer.browser());
}
@@ -522,7 +522,7 @@
void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile());
accessibility::ShowAccessibilityHelp(displayer.browser());
}
@@ -536,7 +536,7 @@
void SystemTrayDelegateChromeOS::ShowPublicAccountInfo() {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile());
chrome::ShowPolicy(displayer.browser());
}
@@ -558,7 +558,7 @@
help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
} else {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile());
chrome::ShowSingletonTab(displayer.browser(),
GURL(chrome::kLearnMoreEnterpriseURL));
}
diff --git a/chrome/browser/ui/ash/system_tray_delegate_common.cc b/chrome/browser/ui/ash/system_tray_delegate_common.cc
index a68917e9..eb151dd 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_common.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_common.cc
@@ -82,7 +82,7 @@
void SystemTrayDelegateCommon::ShowChromeSlow() {
#if defined(OS_LINUX)
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetPrimaryUserProfile());
chrome::ShowSlow(displayer.browser());
#endif // defined(OS_LINUX)
}
diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc
index 0ec615f..9da0bc8 100644
--- a/chrome/browser/ui/ash/window_positioner_unittest.cc
+++ b/chrome/browser/ui/ash/window_positioner_unittest.cc
@@ -68,14 +68,12 @@
dummy_popup->SetBounds(gfx::Rect(16, 32, 128, 256));
// Create a browser for the window.
- Browser::CreateParams window_params(&profile_,
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams window_params(&profile_);
browser_ = chrome::CreateBrowserWithAuraTestWindowForParams(
std::move(dummy_window), &window_params);
// Creating a browser for the popup.
- Browser::CreateParams popup_params(Browser::TYPE_POPUP, &profile_,
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams popup_params(Browser::TYPE_POPUP, &profile_);
browser_popup_ = chrome::CreateBrowserWithAuraTestWindowForParams(
std::move(dummy_popup), &popup_params);
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc
index f64655b..21c9118 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc
@@ -14,8 +14,7 @@
BookmarkBubbleSignInDelegate::BookmarkBubbleSignInDelegate(Browser* browser)
: browser_(browser),
- profile_(browser->profile()),
- desktop_type_(browser->host_desktop_type()) {
+ profile_(browser->profile()) {
BrowserList::AddObserver(this);
}
@@ -39,8 +38,7 @@
Profile* original_profile = profile_->GetOriginalProfile();
browser_ = chrome::FindLastActiveWithProfile(original_profile);
if (!browser_) {
- browser_ = new Browser(Browser::CreateParams(original_profile,
- desktop_type_));
+ browser_ = new Browser(Browser::CreateParams(original_profile));
}
}
}
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
index 3d27884..ad30bbf 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
@@ -8,7 +8,6 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "chrome/browser/ui/browser_list_observer.h"
-#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h"
class Browser;
@@ -39,9 +38,6 @@
// The profile associated with |browser_|.
Profile* profile_;
- // The host desktop of |browser_|.
- chrome::HostDesktopType desktop_type_;
-
DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleSignInDelegate);
};
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 1790b067..427dbad 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -293,39 +293,31 @@
////////////////////////////////////////////////////////////////////////////////
// Browser, CreateParams:
-Browser::CreateParams::CreateParams(Profile* profile,
- chrome::HostDesktopType host_desktop_type)
+Browser::CreateParams::CreateParams(Profile* profile)
: type(TYPE_TABBED),
profile(profile),
- host_desktop_type(host_desktop_type),
trusted_source(false),
initial_show_state(ui::SHOW_STATE_DEFAULT),
is_session_restore(false),
- window(NULL) {
-}
+ window(NULL) {}
-Browser::CreateParams::CreateParams(Type type,
- Profile* profile,
- chrome::HostDesktopType host_desktop_type)
+Browser::CreateParams::CreateParams(Type type, Profile* profile)
: type(type),
profile(profile),
- host_desktop_type(host_desktop_type),
trusted_source(false),
initial_show_state(ui::SHOW_STATE_DEFAULT),
is_session_restore(false),
- window(NULL) {
-}
+ window(NULL) {}
// static
Browser::CreateParams Browser::CreateParams::CreateForApp(
const std::string& app_name,
bool trusted_source,
const gfx::Rect& window_bounds,
- Profile* profile,
- chrome::HostDesktopType host_desktop_type) {
+ Profile* profile) {
DCHECK(!app_name.empty());
- CreateParams params(TYPE_POPUP, profile, host_desktop_type);
+ CreateParams params(TYPE_POPUP, profile);
params.app_name = app_name;
params.trusted_source = trusted_source;
params.initial_bounds = window_bounds;
@@ -335,9 +327,8 @@
// static
Browser::CreateParams Browser::CreateParams::CreateForDevTools(
- Profile* profile,
- chrome::HostDesktopType host_desktop_type) {
- CreateParams params(TYPE_POPUP, profile, host_desktop_type);
+ Profile* profile) {
+ CreateParams params(TYPE_POPUP, profile);
params.app_name = DevToolsWindow::kDevToolsApp;
params.trusted_source = true;
return params;
@@ -384,7 +375,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
is_session_restore_(params.is_session_restore),
- host_desktop_type_(params.host_desktop_type),
+ host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
content_setting_bubble_model_delegate_(
new BrowserContentSettingBubbleModelDelegate(this)),
toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index b9813b8..c20478cd 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -162,20 +162,15 @@
};
struct CreateParams {
- CreateParams(Profile* profile, chrome::HostDesktopType host_desktop_type);
- CreateParams(Type type,
- Profile* profile,
- chrome::HostDesktopType host_desktop_type);
+ explicit CreateParams(Profile* profile);
+ CreateParams(Type type, Profile* profile);
static CreateParams CreateForApp(const std::string& app_name,
bool trusted_source,
const gfx::Rect& window_bounds,
- Profile* profile,
- chrome::HostDesktopType host_desktop_type);
+ Profile* profile);
- static CreateParams CreateForDevTools(
- Profile* profile,
- chrome::HostDesktopType host_desktop_type);
+ static CreateParams CreateForDevTools(Profile* profile);
// The browser type.
Type type;
@@ -183,9 +178,6 @@
// The associated profile.
Profile* profile;
- // The host desktop the browser is created on.
- chrome::HostDesktopType host_desktop_type;
-
// Specifies the browser is_trusted_source_ value.
bool trusted_source;
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 9eb6b54..2519d154 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -1097,7 +1097,7 @@
// Open a second browser window at about:blank.
ui_test_utils::BrowserAddedObserver browser_added_observer;
- chrome::NewEmptyWindow(browser()->profile(), chrome::GetActiveDesktop());
+ chrome::NewEmptyWindow(browser()->profile());
Browser* second_window = browser_added_observer.WaitForSingleNewBrowser();
ui_test_utils::NavigateToURL(second_window, GURL(url::kAboutBlankURL));
@@ -1730,8 +1730,7 @@
IN_PROC_BROWSER_TEST_F(BrowserTest, StartMaximized) {
Browser::Type types[] = { Browser::TYPE_TABBED, Browser::TYPE_POPUP };
for (size_t i = 0; i < arraysize(types); ++i) {
- Browser::CreateParams params(types[i], browser()->profile(),
- browser()->host_desktop_type());
+ Browser::CreateParams params(types[i], browser()->profile());
params.initial_show_state = ui::SHOW_STATE_MAXIMIZED;
AddBlankTabAndShow(new Browser(params));
}
@@ -1748,8 +1747,7 @@
IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_StartMinimized) {
Browser::Type types[] = { Browser::TYPE_TABBED, Browser::TYPE_POPUP };
for (size_t i = 0; i < arraysize(types); ++i) {
- Browser::CreateParams params(types[i], browser()->profile(),
- browser()->host_desktop_type());
+ Browser::CreateParams params(types[i], browser()->profile());
params.initial_show_state = ui::SHOW_STATE_MINIMIZED;
AddBlankTabAndShow(new Browser(params));
}
@@ -1814,10 +1812,8 @@
EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW));
// Create a new browser.
- Browser* new_browser =
- new Browser(Browser::CreateParams(
- browser()->profile()->GetOffTheRecordProfile(),
- browser()->host_desktop_type()));
+ Browser* new_browser = new Browser(
+ Browser::CreateParams(browser()->profile()->GetOffTheRecordProfile()));
CommandUpdater* new_command_updater =
new_browser->command_controller()->command_updater();
// It should have Bookmarks & Settings commands disabled by default.
@@ -1850,8 +1846,7 @@
// Create a new browser.
Browser* new_browser =
- new Browser(Browser::CreateParams(browser()->profile(),
- browser()->host_desktop_type()));
+ new Browser(Browser::CreateParams(browser()->profile()));
CommandUpdater* new_command_updater =
new_browser->command_controller()->command_updater();
EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW));
@@ -1884,8 +1879,7 @@
// Create a popup (non-main-UI-type) browser. Settings command as well
// as Extensions should be disabled.
Browser* popup_browser = new Browser(
- Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(),
- browser()->host_desktop_type()));
+ Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
CommandUpdater* popup_command_updater =
popup_browser->command_controller()->command_updater();
EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS));
@@ -1901,8 +1895,7 @@
DisableOptionsAndImportMenuItemsConsistently) {
// Create a popup browser.
Browser* popup_browser = new Browser(
- Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(),
- browser()->host_desktop_type()));
+ Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
CommandUpdater* command_updater =
popup_browser->command_controller()->command_updater();
// OPTIONS and IMPORT_SETTINGS are disabled for a non-normal UI.
@@ -2387,7 +2380,7 @@
EXPECT_EQ(0u, chrome::GetTotalBrowserCount());
ui_test_utils::BrowserAddedObserver browser_added_observer;
- chrome::NewEmptyWindow(profile, chrome::GetActiveDesktop());
+ chrome::NewEmptyWindow(profile);
browser_added_observer.WaitForSingleNewBrowser();
EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
@@ -3229,8 +3222,7 @@
// Creates an untrusted popup window and asserts that the eventual height is
// padded with the toolbar and title bar height (initial height is content
// height).
- Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile());
params.initial_bounds = gfx::Rect(0, 0, 100, 122);
Browser* browser = new Browser(params);
gfx::Rect bounds = browser->window()->GetBounds();
@@ -3247,8 +3239,7 @@
{
// Creates a trusted popup window and asserts that the eventual height
// doesn't change (initial height is window height).
- Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile());
params.initial_bounds = gfx::Rect(0, 0, 100, 122);
params.trusted_source = true;
Browser* browser = new Browser(params);
@@ -3265,8 +3256,7 @@
// Creates an untrusted app window and asserts that the eventual height
// doesn't change.
Browser::CreateParams params = Browser::CreateParams::CreateForApp(
- "app-name", false, gfx::Rect(0, 0, 100, 122), browser()->profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ "app-name", false, gfx::Rect(0, 0, 100, 122), browser()->profile());
Browser* browser = new Browser(params);
gfx::Rect bounds = browser->window()->GetBounds();
@@ -3281,8 +3271,7 @@
// Creates a trusted app window and asserts that the eventual height
// doesn't change.
Browser::CreateParams params = Browser::CreateParams::CreateForApp(
- "app-name", true, gfx::Rect(0, 0, 100, 122), browser()->profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ "app-name", true, gfx::Rect(0, 0, 100, 122), browser()->profile());
Browser* browser = new Browser(params);
gfx::Rect bounds = browser->window()->GetBounds();
@@ -3296,8 +3285,8 @@
{
// Creates a devtools window and asserts that the eventual height
// doesn't change.
- Browser::CreateParams params = Browser::CreateParams::CreateForDevTools(
- browser()->profile(), chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams params =
+ Browser::CreateParams::CreateForDevTools(browser()->profile());
params.initial_bounds = gfx::Rect(0, 0, 100, 122);
Browser* browser = new Browser(params);
gfx::Rect bounds = browser->window()->GetBounds();
diff --git a/chrome/browser/ui/browser_close_unittest.cc b/chrome/browser/ui/browser_close_unittest.cc
index 634ad9b..d427d1e 100644
--- a/chrome/browser/ui/browser_close_unittest.cc
+++ b/chrome/browser/ui/browser_close_unittest.cc
@@ -155,7 +155,7 @@
std::vector<Browser*> browsers;
for (int i = 0; i < num_windows; ++i) {
TestBrowserWindow* window = new TestBrowserWindow();
- Browser::CreateParams params(profile, chrome::HOST_DESKTOP_TYPE_FIRST);
+ Browser::CreateParams params(profile);
params.type = Browser::TYPE_TABBED;
params.window = window;
Browser* browser = new Browser(params);
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index 6ff3ad2..422a346 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -231,7 +231,7 @@
// Create a new browser based on the off the record profile.
Browser::CreateParams profile_params(
- original_profile->GetOffTheRecordProfile(), chrome::GetActiveDesktop());
+ original_profile->GetOffTheRecordProfile());
scoped_ptr<Browser> otr_browser(
chrome::CreateBrowserWithTestWindowForParams(&profile_params));
@@ -406,8 +406,7 @@
EXPECT_EQ(profile2->GetOriginalProfile(), profile1.get());
// Create a new browser based on the off the record profile.
- Browser::CreateParams profile_params(profile1->GetOffTheRecordProfile(),
- chrome::GetActiveDesktop());
+ Browser::CreateParams profile_params(profile1->GetOffTheRecordProfile());
scoped_ptr<Browser> browser2(
chrome::CreateBrowserWithTestWindowForParams(&profile_params));
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index c2058fb..6b80e387 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -198,8 +198,8 @@
}
case NEW_WINDOW: {
WebContents* new_tab = current_tab->Clone();
- Browser* new_browser = new Browser(Browser::CreateParams(
- browser->profile(), browser->host_desktop_type()));
+ Browser* new_browser =
+ new Browser(Browser::CreateParams(browser->profile()));
new_browser->tab_strip_model()->AddWebContents(
new_tab, -1, ui::PAGE_TRANSITION_LINK,
TabStripModel::ADD_ACTIVE);
@@ -326,7 +326,7 @@
return content_restrictions;
}
-void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
+void NewEmptyWindow(Profile* profile) {
bool incognito = profile->IsOffTheRecord();
PrefService* prefs = profile->GetPrefs();
if (incognito) {
@@ -343,7 +343,7 @@
if (incognito) {
content::RecordAction(UserMetricsAction("NewIncognitoWindow"));
- OpenEmptyWindow(profile->GetOffTheRecordProfile(), desktop_type);
+ OpenEmptyWindow(profile->GetOffTheRecordProfile());
} else {
content::RecordAction(UserMetricsAction("NewWindow"));
SessionService* session_service =
@@ -351,14 +351,14 @@
profile->GetOriginalProfile());
if (!session_service ||
!session_service->RestoreIfNecessary(std::vector<GURL>())) {
- OpenEmptyWindow(profile->GetOriginalProfile(), desktop_type);
+ OpenEmptyWindow(profile->GetOriginalProfile());
}
}
}
-Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
- Browser* browser = new Browser(
- Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
+Browser* OpenEmptyWindow(Profile* profile) {
+ Browser* browser =
+ new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile));
AddTabAt(browser, GURL(), -1, true);
browser->window()->Show();
return browser;
@@ -373,10 +373,8 @@
}
void OpenURLOffTheRecord(Profile* profile,
- const GURL& url,
- chrome::HostDesktopType desktop_type) {
- ScopedTabbedBrowserDisplayer displayer(profile->GetOffTheRecordProfile(),
- desktop_type);
+ const GURL& url) {
+ ScopedTabbedBrowserDisplayer displayer(profile->GetOffTheRecordProfile());
AddSelectedTabWithURL(displayer.browser(), url,
ui::PAGE_TRANSITION_LINK);
}
@@ -537,13 +535,11 @@
}
void NewWindow(Browser* browser) {
- NewEmptyWindow(browser->profile()->GetOriginalProfile(),
- browser->host_desktop_type());
+ NewEmptyWindow(browser->profile()->GetOriginalProfile());
}
void NewIncognitoWindow(Browser* browser) {
- NewEmptyWindow(browser->profile()->GetOffTheRecordProfile(),
- browser->host_desktop_type());
+ NewEmptyWindow(browser->profile()->GetOffTheRecordProfile());
}
void CloseWindow(Browser* browser) {
@@ -563,8 +559,7 @@
AddTabAt(browser, GURL(), -1, true);
browser->tab_strip_model()->GetActiveWebContents()->RestoreFocus();
} else {
- ScopedTabbedBrowserDisplayer displayer(browser->profile(),
- browser->host_desktop_type());
+ ScopedTabbedBrowserDisplayer displayer(browser->profile());
Browser* b = displayer.browser();
AddTabAt(b, GURL(), -1, true);
b->window()->Show();
@@ -671,16 +666,12 @@
} else {
Browser* new_browser = NULL;
if (browser->is_app() && !browser->is_type_popup()) {
- new_browser = new Browser(
- Browser::CreateParams::CreateForApp(browser->app_name(),
- browser->is_trusted_source(),
- gfx::Rect(),
- browser->profile(),
- browser->host_desktop_type()));
+ new_browser = new Browser(Browser::CreateParams::CreateForApp(
+ browser->app_name(), browser->is_trusted_source(), gfx::Rect(),
+ browser->profile()));
} else {
new_browser = new Browser(
- Browser::CreateParams(browser->type(), browser->profile(),
- browser->host_desktop_type()));
+ Browser::CreateParams(browser->type(), browser->profile()));
}
// Preserve the size of the original window. The new window has already
// been given an offset by the OS, so we shouldn't copy the old bounds.
@@ -720,8 +711,7 @@
TabStripModel* tab_strip = browser->tab_strip_model();
WebContents* contents =
tab_strip->DetachWebContentsAt(tab_strip->active_index());
- Browser* b = new Browser(Browser::CreateParams(browser->profile(),
- browser->host_desktop_type()));
+ Browser* b = new Browser(Browser::CreateParams(browser->profile()));
b->tab_strip_model()->AppendWebContents(contents, true);
b->window()->Show();
}
@@ -1230,8 +1220,7 @@
add_types);
} else {
Browser* b = new Browser(
- Browser::CreateParams(Browser::TYPE_TABBED, browser->profile(),
- browser->host_desktop_type()));
+ Browser::CreateParams(Browser::TYPE_TABBED, browser->profile()));
// Preserve the size of the original window. The new window has already
// been given an offset by the OS, so we shouldn't copy the old bounds.
@@ -1301,12 +1290,8 @@
if (index >= 0)
browser->tab_strip_model()->DetachWebContentsAt(index);
- Browser* app_browser = new Browser(
- Browser::CreateParams::CreateForApp(app_name,
- true /* trusted_source */,
- gfx::Rect(),
- browser->profile(),
- browser->host_desktop_type()));
+ Browser* app_browser = new Browser(Browser::CreateParams::CreateForApp(
+ app_name, true /* trusted_source */, gfx::Rect(), browser->profile()));
app_browser->tab_strip_model()->AppendWebContents(contents, true);
contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h
index e668084..7c045cd5 100644
--- a/chrome/browser/ui/browser_commands.h
+++ b/chrome/browser/ui/browser_commands.h
@@ -42,22 +42,20 @@
int GetContentRestrictions(const Browser* browser);
// Opens a new window with the default blank tab.
-void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type);
+void NewEmptyWindow(Profile* profile);
// Opens a new window with the default blank tab. This bypasses metrics and
// various internal bookkeeping; NewEmptyWindow (above) is preferred.
-Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type);
+Browser* OpenEmptyWindow(Profile* profile);
// Opens a new window with the tabs from |profile|'s TabRestoreService.
void OpenWindowWithRestoredTabs(Profile* profile,
HostDesktopType host_desktop_type);
-// Opens the specified URL in a new browser window in an incognito session on
-// the desktop specified by |desktop_type|. If there is already an existing
-// active incognito session for the specified |profile|, that session is re-
-// used.
-void OpenURLOffTheRecord(Profile* profile, const GURL& url,
- chrome::HostDesktopType desktop_type);
+// Opens the specified URL in a new browser window in an incognito session. If
+// there is already an existing active incognito session for the specified
+// |profile|, that session is re- used.
+void OpenURLOffTheRecord(Profile* profile, const GURL& url);
bool CanGoBack(const Browser* browser);
void GoBack(Browser* browser, WindowOpenDisposition disposition);
diff --git a/chrome/browser/ui/browser_finder_chromeos_unittest.cc b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
index a88c1523..f7485f481 100644
--- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc
+++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
@@ -95,8 +95,7 @@
set_browser(nullptr);
// Create an incognito browser.
- Browser::CreateParams params(profile()->GetOffTheRecordProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params(profile()->GetOffTheRecordProfile());
scoped_ptr<Browser> incognito_browser(
chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, ¶ms));
// Incognito windows are excluded in GetBrowserCount() because kMatchAll
@@ -109,8 +108,7 @@
TEST_F(BrowserFinderChromeOSTest, FindBrowserOwnedByAnotherProfile) {
set_browser(nullptr);
- Browser::CreateParams params(profile()->GetOriginalProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params(profile()->GetOriginalProfile());
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, ¶ms));
GetUserWindowManager()->SetWindowOwner(browser->window()->GetNativeWindow(),
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index f034b138..142b522 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -377,9 +377,8 @@
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
// Open a new browser window.
- Browser* browser2 =
- new Browser(Browser::CreateParams(browser()->profile(),
- browser()->host_desktop_type()));
+ Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
+
ASSERT_TRUE(browser2);
chrome::AddTabAt(browser2, GURL(), -1, true);
browser2->window()->Show();
diff --git a/chrome/browser/ui/browser_instant_controller_unittest.cc b/chrome/browser/ui/browser_instant_controller_unittest.cc
index 428d707..37223cb 100644
--- a/chrome/browser/ui/browser_instant_controller_unittest.cc
+++ b/chrome/browser/ui/browser_instant_controller_unittest.cc
@@ -210,7 +210,7 @@
TEST_F(BrowserInstantControllerTest, BrowserWindowLifecycle) {
scoped_ptr<BrowserWindow> window(CreateBrowserWindow());
- Browser::CreateParams params(profile(), chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams params(profile());
params.window = window.get();
scoped_ptr<Browser> browser(new Browser(params));
InstantServiceObserver* bic;
diff --git a/chrome/browser/ui/browser_live_tab_context.cc b/chrome/browser/ui/browser_live_tab_context.cc
index 54f4e78..60dd320 100644
--- a/chrome/browser/ui/browser_live_tab_context.cc
+++ b/chrome/browser/ui/browser_live_tab_context.cc
@@ -109,12 +109,11 @@
const std::string& app_name) {
Browser* browser;
if (app_name.empty()) {
- browser = new Browser(Browser::CreateParams(profile, host_desktop_type));
+ browser = new Browser(Browser::CreateParams(profile));
} else {
// Only trusted app popup windows should ever be restored.
browser = new Browser(Browser::CreateParams::CreateForApp(
- app_name, true /* trusted_source */, gfx::Rect(), profile,
- host_desktop_type));
+ app_name, true /* trusted_source */, gfx::Rect(), profile));
}
if (browser)
return browser->live_tab_context();
diff --git a/chrome/browser/ui/browser_mac.cc b/chrome/browser/ui/browser_mac.cc
index 05f1a636..405a2071 100644
--- a/chrome/browser/ui/browser_mac.cc
+++ b/chrome/browser/ui/browser_mac.cc
@@ -12,82 +12,63 @@
namespace chrome {
void OpenAboutWindow(Profile* profile) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowAboutChrome(browser);
browser->window()->Show();
}
void OpenHistoryWindow(Profile* profile) {
Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ new Browser(Browser::CreateParams(profile));
ShowHistory(browser);
browser->window()->Show();
}
void OpenDownloadsWindow(Profile* profile) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowDownloads(browser);
browser->window()->Show();
}
void OpenHelpWindow(Profile* profile, HelpSource source) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowHelp(browser, source);
browser->window()->Show();
}
void OpenOptionsWindow(Profile* profile) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowSettings(browser);
browser->window()->Show();
}
void OpenSyncSetupWindow(Profile* profile,
signin_metrics::AccessPoint access_point) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowBrowserSigninOrSettings(browser, access_point);
browser->window()->Show();
}
void OpenClearBrowsingDataDialogWindow(Profile* profile) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowClearBrowsingDataDialog(browser);
browser->window()->Show();
}
void OpenImportSettingsDialogWindow(Profile* profile) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowImportDialog(browser);
browser->window()->Show();
}
void OpenBookmarkManagerWindow(Profile* profile) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowBookmarkManager(browser);
browser->window()->Show();
}
void OpenExtensionsWindow(Profile* profile) {
- Browser* browser =
- new Browser(Browser::CreateParams(profile,
- chrome::HOST_DESKTOP_TYPE_NATIVE));
+ Browser* browser = new Browser(Browser::CreateParams(profile));
ShowExtensions(browser, std::string());
browser->window()->Show();
}
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 5ba1761..784ece51 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -82,11 +82,9 @@
// Finds an existing Browser compatible with |profile|, making a new one if no
// such Browser is located.
-Browser* GetOrCreateBrowser(Profile* profile,
- chrome::HostDesktopType host_desktop_type) {
+Browser* GetOrCreateBrowser(Profile* profile) {
Browser* browser = chrome::FindTabbedBrowser(profile, false);
- return browser ? browser : new Browser(
- Browser::CreateParams(profile, host_desktop_type));
+ return browser ? browser : new Browser(Browser::CreateParams(profile));
}
// Change some of the navigation parameters based on the particular URL.
@@ -116,7 +114,7 @@
}
params->disposition = SINGLETON_TAB;
- params->browser = GetOrCreateBrowser(profile, params->host_desktop_type);
+ params->browser = GetOrCreateBrowser(profile);
params->window_action = chrome::NavigateParams::SHOW_WINDOW;
}
@@ -144,7 +142,7 @@
return params->browser;
// Find a compatible window and re-execute this command in it. Otherwise
// re-run with NEW_WINDOW.
- return GetOrCreateBrowser(profile, params->host_desktop_type);
+ return GetOrCreateBrowser(profile);
case SINGLETON_TAB:
case NEW_FOREGROUND_TAB:
case NEW_BACKGROUND_TAB:
@@ -153,7 +151,7 @@
return params->browser;
// Find a compatible window and re-execute this command in it. Otherwise
// re-run with NEW_WINDOW.
- return GetOrCreateBrowser(profile, params->host_desktop_type);
+ return GetOrCreateBrowser(profile);
case NEW_POPUP: {
// Make a new popup window.
// Coerce app-style if |source| represents an app.
@@ -174,29 +172,22 @@
}
#endif
if (app_name.empty()) {
- Browser::CreateParams browser_params(
- Browser::TYPE_POPUP, profile, params->host_desktop_type);
+ Browser::CreateParams browser_params(Browser::TYPE_POPUP, profile);
browser_params.trusted_source = params->trusted_source;
browser_params.initial_bounds = params->window_bounds;
return new Browser(browser_params);
}
return new Browser(Browser::CreateParams::CreateForApp(
- app_name,
- params->trusted_source,
- params->window_bounds,
- profile,
- params->host_desktop_type));
+ app_name, params->trusted_source, params->window_bounds, profile));
}
case NEW_WINDOW: {
// Make a new normal browser window.
- return new Browser(Browser::CreateParams(profile,
- params->host_desktop_type));
+ return new Browser(Browser::CreateParams(profile));
}
case OFF_THE_RECORD:
// Make or find an incognito window.
- return GetOrCreateBrowser(profile->GetOffTheRecordProfile(),
- params->host_desktop_type);
+ return GetOrCreateBrowser(profile->GetOffTheRecordProfile());
// The following types all result in no navigation.
case SUPPRESS_OPEN:
case SAVE_TO_DISK:
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index e730a2a7..e5442d4 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -114,17 +114,14 @@
Browser* BrowserNavigatorTest::CreateEmptyBrowserForType(Browser::Type type,
Profile* profile) {
- Browser* browser = new Browser(
- Browser::CreateParams(type, profile, chrome::GetActiveDesktop()));
+ Browser* browser = new Browser(Browser::CreateParams(type, profile));
chrome::AddTabAt(browser, GURL(), -1, true);
return browser;
}
Browser* BrowserNavigatorTest::CreateEmptyBrowserForApp(Profile* profile) {
- Browser* browser = new Browser(
- Browser::CreateParams::CreateForApp(
- "Test", false /* trusted_source */, gfx::Rect(), profile,
- chrome::GetActiveDesktop()));
+ Browser* browser = new Browser(Browser::CreateParams::CreateForApp(
+ "Test", false /* trusted_source */, gfx::Rect(), profile));
chrome::AddTabAt(browser, GURL(), -1, true);
return browser;
}
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
index 1ae7fb9..fc60f8b8 100644
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
@@ -57,8 +57,7 @@
DCHECK(browser_->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP));
// Create an empty new browser window the same size as the old one.
- Browser::CreateParams params(browser_->profile(),
- browser_->host_desktop_type());
+ Browser::CreateParams params(browser_->profile());
params.initial_bounds = window_bounds;
params.initial_show_state =
maximize ? ui::SHOW_STATE_MAXIMIZED : ui::SHOW_STATE_NORMAL;
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 5ba3f71..3e16b17a 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -124,8 +124,7 @@
}
scoped_ptr<ScopedTabbedBrowserDisplayer> displayer;
if (!browser) {
- displayer.reset(
- new ScopedTabbedBrowserDisplayer(profile, host_desktop_type));
+ displayer.reset(new ScopedTabbedBrowserDisplayer(profile));
browser = displayer->browser();
}
ShowSingletonTab(browser, url);
@@ -287,8 +286,7 @@
}
Browser* browser = chrome::FindTabbedBrowser(profile, false);
if (!browser) {
- browser = new Browser(
- Browser::CreateParams(profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
+ browser = new Browser(Browser::CreateParams(profile));
}
ShowSettingsSubPageInTabbedBrowser(browser, sub_page);
}
@@ -372,8 +370,7 @@
scoped_ptr<ScopedTabbedBrowserDisplayer> displayer;
if (browser->profile()->IsOffTheRecord()) {
switched_browser = true;
- displayer.reset(new ScopedTabbedBrowserDisplayer(
- original_profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
+ displayer.reset(new ScopedTabbedBrowserDisplayer(original_profile));
browser = displayer->browser();
}
diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm
index 9ebd1fb3..3f4bdfd7 100644
--- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm
+++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm
@@ -25,12 +25,9 @@
// Create additional |Browser*| objects of different type.
Profile* profile = browser()->profile();
Browser* b1 =
- new Browser(Browser::CreateParams(Browser::TYPE_POPUP, profile,
- browser()->host_desktop_type()));
- Browser* b2 = new Browser(
- Browser::CreateParams::CreateForApp(
- "Test", true /* trusted_source */, gfx::Rect(), profile,
- browser()->host_desktop_type()));
+ new Browser(Browser::CreateParams(Browser::TYPE_POPUP, profile));
+ Browser* b2 = new Browser(Browser::CreateParams::CreateForApp(
+ "Test", true /* trusted_source */, gfx::Rect(), profile));
EXPECT_EQ(3U, [[NSApp appleScriptWindows] count]);
for (WindowAppleScript* window in [NSApp appleScriptWindows]) {
diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
index e80100c..fa16657 100644
--- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
@@ -75,8 +75,7 @@
}
if ((self = [super init])) {
- browser_ = new Browser(
- Browser::CreateParams(aProfile, chrome::HOST_DESKTOP_TYPE_NATIVE));
+ browser_ = new Browser(Browser::CreateParams(aProfile));
chrome::NewTab(browser_);
browser_->window()->Show();
base::scoped_nsobject<NSNumber> numID(
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm
index 5d2afbe9..19ab345c 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm
@@ -48,8 +48,7 @@
app1_ = GetFirstAppWindow();
app2_ = CreateAppWindow(extension);
browser1_ = browser()->window();
- browser2_ = (new Browser(Browser::CreateParams(
- profile(), chrome::HOST_DESKTOP_TYPE_NATIVE)))->window();
+ browser2_ = (new Browser(Browser::CreateParams(profile())))->window();
browser2_->Show();
// Since a pending key status change on any window could cause the test to
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
index e3226c1..7c3f346b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
@@ -101,7 +101,7 @@
}
Browser* CreateBrowser() override {
- Browser::CreateParams params(profile(), chrome::GetActiveDesktop());
+ Browser::CreateParams params(profile());
return chrome::CreateBrowserWithTestWindowForParams(¶ms).release();
}
};
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
index 7fd9271..5bc7264 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
@@ -92,8 +92,7 @@
- (void)openURLForNode:(const BookmarkNode*)node {
Browser* browser = chrome::FindTabbedBrowser(bridge_->GetProfile(), true);
if (!browser) {
- browser = new Browser(Browser::CreateParams(
- bridge_->GetProfile(), chrome::HOST_DESKTOP_TYPE_NATIVE));
+ browser = new Browser(Browser::CreateParams(bridge_->GetProfile()));
}
WindowOpenDisposition disposition =
ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
@@ -113,8 +112,7 @@
Browser* browser = chrome::FindTabbedBrowser(bridge_->GetProfile(), true);
if (!browser) {
- browser = new Browser(Browser::CreateParams(
- bridge_->GetProfile(), chrome::HOST_DESKTOP_TYPE_NATIVE));
+ browser = new Browser(Browser::CreateParams(bridge_->GetProfile()));
}
DCHECK(browser);
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index b98694e3..44237b0 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 @@
// 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, 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, 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, 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 @@
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]);
diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
index 28853eb..05b29ccd 100644
--- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm
+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
@@ -97,6 +97,5 @@
}
Browser* CocoaProfileTest::CreateBrowser() {
- return new Browser(Browser::CreateParams(profile(),
- chrome::GetActiveDesktop()));
+ return new Browser(Browser::CreateParams(profile()));
}
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
index 1fe1b5d..6d8d127 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
@@ -264,8 +264,7 @@
if (navigator_) {
navigator_->OpenURL(params);
} else {
- chrome::ScopedTabbedBrowserDisplayer displayer(
- profile_, chrome::GetActiveDesktop());
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
displayer.browser()->OpenURL(params);
}
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
index 46501ef..e72b588 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
@@ -51,8 +51,7 @@
TEST_F(AvatarIconControllerTest, ShowingAvatarIconInIncognito) {
Browser* browser =
- new Browser(Browser::CreateParams(profile()->GetOffTheRecordProfile(),
- chrome::GetActiveDesktop()));
+ new Browser(Browser::CreateParams(profile()->GetOffTheRecordProfile()));
BrowserWindowCocoa* window =
static_cast<BrowserWindowCocoa*>(browser->window());
AvatarBaseController* icon_controller =
diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
index 25e6e64..8de12fd 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
@@ -202,7 +202,7 @@
ASSERT_EQ(7, [menu numberOfItems]);
// Create a browser and "show" it.
- Browser::CreateParams profile2_params(profile2, chrome::GetActiveDesktop());
+ Browser::CreateParams profile2_params(profile2);
scoped_ptr<Browser> p2_browser(
chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
BrowserList::SetLastActive(p2_browser.get());
@@ -213,7 +213,7 @@
VerifyProfileNamedIsActive(@"Profile 2", __LINE__);
// Open a new browser and make sure it takes effect.
- Browser::CreateParams profile3_params(profile3, chrome::GetActiveDesktop());
+ Browser::CreateParams profile3_params(profile3);
scoped_ptr<Browser> p3_browser(
chrome::CreateBrowserWithTestWindowForParams(&profile3_params));
BrowserList::SetLastActive(p3_browser.get());
@@ -279,8 +279,7 @@
EXPECT_TRUE([controller() validateMenuItem:item]);
// Open a new browser for the supervised user and switch to it.
- Browser::CreateParams supervised_profile_params(
- supervised_profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams supervised_profile_params(supervised_profile);
scoped_ptr<Browser> supervised_browser(
chrome::CreateBrowserWithTestWindowForParams(&supervised_profile_params));
BrowserList::SetLastActive(supervised_browser.get());
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 986bf75..13025c6 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -195,12 +195,8 @@
extensions::AppLaunchInfo::GetLaunchHeight(extension));
}
- Browser::CreateParams browser_params(
- Browser::CreateParams::CreateForApp(app_name,
- true /* trusted_source */,
- initial_bounds,
- profile,
- params.desktop_type));
+ Browser::CreateParams browser_params(Browser::CreateParams::CreateForApp(
+ app_name, true /* trusted_source */, initial_bounds, profile));
browser_params.initial_show_state = DetermineWindowShowState(profile,
params.container,
@@ -235,9 +231,7 @@
WebContents* contents = NULL;
if (!browser) {
// No browser for this profile, need to open a new one.
- browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED,
- profile,
- launch_params.desktop_type));
+ browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile));
browser->window()->Show();
// There's no current tab in this browser window, so add a new one.
disposition = NEW_FOREGROUND_TAB;
diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc
index 18481686..dd8eaa6 100644
--- a/chrome/browser/ui/extensions/extension_install_ui_default.cc
+++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc
@@ -57,8 +57,7 @@
// after fixing http://crbug.com/38676.
if (!IncognitoModePrefs::CanOpenBrowser(profile))
return NULL;
- chrome::ScopedTabbedBrowserDisplayer displayer(
- profile, chrome::GetActiveDesktop());
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile);
Browser* browser = displayer.browser();
if (browser->tab_strip_model()->count() == 0)
chrome::AddTabAt(browser, GURL(), -1, true);
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
index e6e73fed..7f655bc 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
@@ -45,8 +45,7 @@
extensions::Manifest::UNPACKED);
extension_service()->AddExtension(action_extension.get());
- Browser* second_browser = new Browser(
- Browser::CreateParams(profile(), browser()->host_desktop_type()));
+ Browser* second_browser = new Browser(Browser::CreateParams(profile()));
base::RunLoop().RunUntilIdle();
CheckBubble(second_browser, ANCHOR_BROWSER_ACTION);
@@ -61,8 +60,7 @@
extensions::Manifest::UNPACKED);
extension_service()->AddExtension(no_action_extension.get());
- Browser* second_browser = new Browser(
- Browser::CreateParams(profile(), browser()->host_desktop_type()));
+ Browser* second_browser = new Browser(Browser::CreateParams(profile()));
base::RunLoop().RunUntilIdle();
CheckBubble(second_browser, ANCHOR_APP_MENU);
@@ -85,8 +83,7 @@
extensions::Manifest::INTERNAL);
extension_service()->AddExtension(action_extension.get());
- Browser* second_browser = new Browser(
- Browser::CreateParams(profile(), browser()->host_desktop_type()));
+ Browser* second_browser = new Browser(Browser::CreateParams(profile()));
base::RunLoop().RunUntilIdle();
CheckBubble(second_browser, ANCHOR_APP_MENU);
@@ -105,8 +102,7 @@
// Create a second browser with the extension installed - the bubble will be
// set to show.
- Browser* second_browser = new Browser(
- Browser::CreateParams(profile(), browser()->host_desktop_type()));
+ Browser* second_browser = new Browser(Browser::CreateParams(profile()));
ASSERT_TRUE(second_browser);
// Uninstall the extension before the bubble is shown. This should not crash,
// and the bubble shouldn't be shown.
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index 49eb884..3616e43 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -1324,8 +1324,7 @@
// Open a new incognito window and navigate to the same page.
Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile();
Browser* incognito_browser =
- new Browser(Browser::CreateParams(incognito_profile,
- browser()->host_desktop_type()));
+ new Browser(Browser::CreateParams(incognito_profile));
content::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
@@ -1386,8 +1385,7 @@
}
IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FitWindow) {
- Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile(),
- browser()->host_desktop_type());
+ Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile());
params.initial_bounds = gfx::Rect(0, 0, 250, 500);
Browser* popup = new Browser(params);
content::WindowedNotificationObserver observer(
diff --git a/chrome/browser/ui/scoped_tabbed_browser_displayer.cc b/chrome/browser/ui/scoped_tabbed_browser_displayer.cc
index eb1e968..c3dd177 100644
--- a/chrome/browser/ui/scoped_tabbed_browser_displayer.cc
+++ b/chrome/browser/ui/scoped_tabbed_browser_displayer.cc
@@ -10,12 +10,10 @@
namespace chrome {
-ScopedTabbedBrowserDisplayer::ScopedTabbedBrowserDisplayer(
- Profile* profile,
- HostDesktopType type) {
+ScopedTabbedBrowserDisplayer::ScopedTabbedBrowserDisplayer(Profile* profile) {
browser_ = FindTabbedBrowser(profile, false);
if (!browser_)
- browser_ = new Browser(Browser::CreateParams(profile, type));
+ browser_ = new Browser(Browser::CreateParams(profile));
}
ScopedTabbedBrowserDisplayer::~ScopedTabbedBrowserDisplayer() {
diff --git a/chrome/browser/ui/scoped_tabbed_browser_displayer.h b/chrome/browser/ui/scoped_tabbed_browser_displayer.h
index 7f00e6e3..12ed11b 100644
--- a/chrome/browser/ui/scoped_tabbed_browser_displayer.h
+++ b/chrome/browser/ui/scoped_tabbed_browser_displayer.h
@@ -13,13 +13,13 @@
namespace chrome {
-// This class finds the last active tabbed browser matching |profile| and
-// |type|. If there is no tabbed browser, a new non visible browser is created.
+// This class finds the last active tabbed browser matching |profile|. If there
+// is no tabbed browser, a new non visible browser is created.
// ScopedTabbedBrowserDisplayer ensures that the browser is made visible and is
// activated by the time that ScopedTabbedBrowserDisplayer goes out of scope.
class ScopedTabbedBrowserDisplayer {
public:
- ScopedTabbedBrowserDisplayer(Profile* profile, HostDesktopType type);
+ explicit ScopedTabbedBrowserDisplayer(Profile* profile);
~ScopedTabbedBrowserDisplayer();
Browser* browser() {
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
index 32e0638..b5f9de5 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
@@ -56,8 +56,7 @@
browser()->profile()))));
// Create a browser which we can close during the test.
- Browser::CreateParams params(browser()->profile(),
- browser()->host_desktop_type());
+ Browser::CreateParams params(browser()->profile());
scoped_ptr<Browser> first_browser(
chrome::CreateBrowserWithTestWindowForParams(¶ms));
AddTab(first_browser.get(), GURL(chrome::kChromeUINewTabURL));
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index d08008a1..9affdd5 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -233,8 +233,7 @@
BrowserList::AddObserver(&observer);
Browser* popup = new Browser(
- Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(),
- browser()->host_desktop_type()));
+ Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
ASSERT_TRUE(popup->is_type_popup());
ASSERT_EQ(popup, observer.added_browser_);
@@ -838,17 +837,15 @@
ASSERT_TRUE(profile2);
// Open some urls with the browsers, and close them.
- Browser* browser1 = new Browser(
- Browser::CreateParams(Browser::TYPE_TABBED, profile1,
- browser()->host_desktop_type()));
+ Browser* browser1 =
+ new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile1));
chrome::NewTab(browser1);
ui_test_utils::NavigateToURL(browser1,
embedded_test_server()->GetURL("/empty.html"));
CloseBrowserSynchronously(browser1);
Browser* browser2 = new Browser(
- Browser::CreateParams(Browser::TYPE_TABBED, profile2,
- browser()->host_desktop_type()));
+ Browser::CreateParams(Browser::TYPE_TABBED, profile2));
chrome::NewTab(browser2);
ui_test_utils::NavigateToURL(browser2,
embedded_test_server()->GetURL("/form.html"));
@@ -992,8 +989,7 @@
// Open a page with profile_last.
Browser* browser_last = new Browser(
- Browser::CreateParams(Browser::TYPE_TABBED, profile_last,
- browser()->host_desktop_type()));
+ Browser::CreateParams(Browser::TYPE_TABBED, profile_last));
chrome::NewTab(browser_last);
ui_test_utils::NavigateToURL(browser_last,
embedded_test_server()->GetURL("/empty.html"));
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index d7b4b7b..c648526 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -630,7 +630,7 @@
// The startup code only executes for browsers launched in desktop mode.
// i.e. HOST_DESKTOP_TYPE_NATIVE. Ash should never get here.
Browser* browser = SessionRestore::RestoreSession(
- profile_, NULL, desktop_type, restore_behavior, adjusted_urls);
+ profile_, NULL, restore_behavior, adjusted_urls);
AddInfoBarsIfNecessary(browser, chrome::startup::IS_PROCESS_STARTUP);
return true;
@@ -744,7 +744,7 @@
profile_ = browser->profile();
if (!browser || !browser->is_type_tabbed())
- browser = new Browser(Browser::CreateParams(profile_, desktop_type));
+ browser = new Browser(Browser::CreateParams(profile_));
bool first_tab = true;
ProtocolHandlerRegistry* registry = profile_ ?
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index d81c05e..05ac8b57 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -547,8 +547,7 @@
// create a new one.
browser = chrome::FindLastActiveWithProfile(profile);
if (!browser) {
- browser = new Browser(Browser::CreateParams(profile,
- desktop_type));
+ browser = new Browser(Browser::CreateParams(profile));
chrome::AddTabAt(browser, GURL(), -1, true);
}
browser->window()->Show();
diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
index 641d22c..51f9d77 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
@@ -44,13 +44,12 @@
EXPECT_EQ(0U, CountAllTabs());
// Create more browsers/windows.
- Browser::CreateParams native_params(profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams native_params(profile());
scoped_ptr<Browser> browser2(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
// Create browser 3 and 4 on the Ash desktop (the TabContentsIterator
// shouldn't see the difference).
- Browser::CreateParams ash_params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams ash_params(profile());
scoped_ptr<Browser> browser3(
chrome::CreateBrowserWithTestWindowForParams(&ash_params));
scoped_ptr<Browser> browser4(
@@ -91,13 +90,12 @@
EXPECT_EQ(1U, BrowserList::GetInstance()->size());
// Create more browsers/windows.
- Browser::CreateParams native_params(profile(),
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams native_params(profile());
scoped_ptr<Browser> browser2(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
// Create browser 3 on the Ash desktop (the TabContentsIterator shouldn't see
// the difference).
- Browser::CreateParams ash_params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams ash_params(profile());
scoped_ptr<Browser> browser3(
chrome::CreateBrowserWithTestWindowForParams(&ash_params));
diff --git a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc
index 6d1ed33..f6cd4b5 100644
--- a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc
+++ b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc
@@ -55,8 +55,7 @@
browser()->tab_strip_model()->SetTabPinned(0, true);
// Create a popup.
- Browser::CreateParams params(Browser::TYPE_POPUP, profile(),
- browser()->host_desktop_type());
+ Browser::CreateParams params(Browser::TYPE_POPUP, profile());
scoped_ptr<Browser> popup(
chrome::CreateBrowserWithTestWindowForParams(¶ms));
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
index 93169f6..7e5fa26a 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -500,7 +500,7 @@
TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
ASSERT_TRUE(profile()->CreateHistoryService(true, false));
profile()->CreateFaviconService();
- Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop());
+ Browser::CreateParams native_params(profile());
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
FaviconDelegate favicon_delegate;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 53c21247..893f9770 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -280,8 +280,7 @@
bookmarks::test::WaitForBookmarkModelToLoad(model_);
profile_->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
- Browser::CreateParams native_params(profile_.get(),
- chrome::GetActiveDesktop());
+ Browser::CreateParams native_params(profile_.get());
browser_ = chrome::CreateBrowserWithTestWindowForParams(&native_params);
local_state_.reset(new ScopedTestingLocalState(
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index bdeeff9a..f1c02d1 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -630,8 +630,7 @@
if (navigator_) {
navigator_->OpenURL(params);
} else {
- chrome::ScopedTabbedBrowserDisplayer displayer(
- profile_, chrome::GetActiveDesktop());
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
displayer.browser()->OpenURL(params);
}
GetWidget()->Close();
diff --git a/chrome/browser/ui/views/frame/browser_view_browsertest.cc b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
index ccfab451..9c63862 100644
--- a/chrome/browser/ui/views/frame/browser_view_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
@@ -85,9 +85,7 @@
// Additionally when one of the tabs is destroyed NotifyNavigationStateChanged()
// is invoked on the other.
IN_PROC_BROWSER_TEST_F(BrowserViewTest, CloseWithTabs) {
- Browser* browser2 =
- new Browser(Browser::CreateParams(browser()->profile(),
- browser()->host_desktop_type()));
+ Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
chrome::AddTabAt(browser2, GURL(), -1, true);
chrome::AddTabAt(browser2, GURL(), -1, true);
TestWebContentsObserver observer(
@@ -99,9 +97,7 @@
// Same as CloseWithTabs, but activates the first tab, which is the first tab
// BrowserView will destroy.
IN_PROC_BROWSER_TEST_F(BrowserViewTest, CloseWithTabsStartWithActive) {
- Browser* browser2 =
- new Browser(Browser::CreateParams(browser()->profile(),
- browser()->host_desktop_type()));
+ Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
chrome::AddTabAt(browser2, GURL(), -1, true);
chrome::AddTabAt(browser2, GURL(), -1, true);
browser2->tab_strip_model()->ActivateTabAt(0, true);
diff --git a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc
index 3f5418e..9fbc0bc 100644
--- a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc
@@ -56,9 +56,7 @@
// of Activate() is not well defined and can vary by window manager.
#if defined(OS_WIN)
// Open a new browser window.
- Browser* browser2 =
- new Browser(Browser::CreateParams(browser()->profile(),
- browser()->host_desktop_type()));
+ Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
ASSERT_TRUE(browser2);
chrome::AddTabAt(browser2, GURL(), -1, true);
browser2->window()->Show();
diff --git a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
index 8d334ad..f499416 100644
--- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
@@ -62,9 +62,8 @@
Browser::CreateParams params =
test_app ? Browser::CreateParams::CreateForApp(
"test_browser_app", true /* trusted_source */, gfx::Rect(),
- browser()->profile(), browser()->host_desktop_type())
- : Browser::CreateParams(browser()->profile(),
- browser()->host_desktop_type());
+ browser()->profile())
+ : Browser::CreateParams(browser()->profile());
params.initial_show_state = ui::SHOW_STATE_DEFAULT;
bool is_ash = browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH;
// Default |browser()| is not used by this test.
diff --git a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
index 64bf454..84227e61f 100644
--- a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
+++ b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
@@ -62,12 +62,9 @@
BrowserWindow* browser_window) override {
RegisterExtension(profile);
- Browser::CreateParams params(profile, host_desktop_type);
- params = Browser::CreateParams::CreateForApp("_crx_abc",
- false /* trusted_source */,
- gfx::Rect(),
- profile,
- host_desktop_type);
+ Browser::CreateParams params(profile);
+ params = Browser::CreateParams::CreateForApp(
+ "_crx_abc", false /* trusted_source */, gfx::Rect(), profile);
params.window = browser_window;
return new Browser(params);
}
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 82b4d769..049cd94 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -1748,9 +1748,7 @@
Profile* profile =
Profile::FromBrowserContext(drag_data_[0].contents->GetBrowserContext());
- Browser::CreateParams create_params(Browser::TYPE_TABBED,
- profile,
- host_desktop_type_);
+ Browser::CreateParams create_params(Browser::TYPE_TABBED, profile);
create_params.initial_bounds = new_bounds;
Browser* browser = new Browser(create_params);
is_dragging_new_browser_ = true;
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index f3c8874..09b19e8 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -1833,8 +1833,7 @@
->GetDisplayNearestWindow(second_root)
.work_area();
work_area.Inset(20, 20, 20, 60);
- Browser::CreateParams params(browser()->profile(),
- browser()->host_desktop_type());
+ Browser::CreateParams params(browser()->profile());
params.initial_show_state = ui::SHOW_STATE_NORMAL;
params.initial_bounds = work_area;
Browser* browser2 = new Browser(params);
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
index 14f505f..23b7247 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
@@ -141,8 +141,7 @@
browser_actions();
// Create a second browser.
- Browser* second_browser = new Browser(
- Browser::CreateParams(profile(), browser()->host_desktop_type()));
+ Browser* second_browser = new Browser(Browser::CreateParams(profile()));
BrowserActionsContainer* second =
BrowserView::GetBrowserViewForBrowser(second_browser)->toolbar()->
browser_actions();
diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.cc b/chrome/browser/ui/webui/chrome_web_contents_handler.cc
index 079fd0b..7b0360d 100644
--- a/chrome/browser/ui/webui/chrome_web_contents_handler.cc
+++ b/chrome/browser/ui/webui/chrome_web_contents_handler.cc
@@ -38,18 +38,10 @@
Profile* profile = Profile::FromBrowserContext(context);
- chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
- if (source) {
- Browser* source_browser = chrome::FindBrowserWithWebContents(source);
- if (source_browser)
- desktop_type = source_browser->host_desktop_type();
- }
-
Browser* browser = chrome::FindTabbedBrowser(profile, false);
const bool browser_created = !browser;
if (!browser)
- browser = new Browser(
- Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
+ browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile));
chrome::NavigateParams nav_params(browser, params.url, params.transition);
nav_params.referrer = params.referrer;
if (source && source->IsCrashed() &&
@@ -88,18 +80,10 @@
Profile* profile = Profile::FromBrowserContext(context);
- chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
- if (source) {
- Browser* source_browser = chrome::FindBrowserWithWebContents(source);
- if (source_browser)
- desktop_type = source_browser->host_desktop_type();
- }
-
Browser* browser = chrome::FindTabbedBrowser(profile, false);
const bool browser_created = !browser;
if (!browser)
- browser = new Browser(
- Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
+ browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile));
chrome::NavigateParams params(browser, new_contents);
params.source_contents = source;
params.disposition = disposition;
diff --git a/chrome/browser/ui/webui/foreign_session_handler.cc b/chrome/browser/ui/webui/foreign_session_handler.cc
index 2f98db9..51b0620 100644
--- a/chrome/browser/ui/webui/foreign_session_handler.cc
+++ b/chrome/browser/ui/webui/foreign_session_handler.cc
@@ -183,11 +183,8 @@
window_num == kInvalidId ?
std::vector<const ::sessions::SessionWindow*>::const_iterator(
windows.end()) : iter_begin + 1;
- chrome::HostDesktopType host_desktop_type =
- chrome::GetHostDesktopTypeForNativeView(
- web_ui->GetWebContents()->GetNativeView());
- SessionRestore::RestoreForeignSessionWindows(
- Profile::FromWebUI(web_ui), host_desktop_type, iter_begin, iter_end);
+ SessionRestore::RestoreForeignSessionWindows(Profile::FromWebUI(web_ui),
+ iter_begin, iter_end);
}
// static
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index 14e2a4b..92d3ffd 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -367,8 +367,8 @@
bool force_new_tab = false;
if (!browser) {
// Settings is not displayed in a browser window. Open a new window.
- browser = new Browser(Browser::CreateParams(
- Browser::TYPE_TABBED, GetProfile(), chrome::GetActiveDesktop()));
+ browser =
+ new Browser(Browser::CreateParams(Browser::TYPE_TABBED, GetProfile()));
force_new_tab = true;
}
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 9dd8c79..240c3a0 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -1146,8 +1146,7 @@
Profile* profile = Profile::FromBrowserContext(
preview_web_contents()->GetBrowserContext());
- chrome::ScopedTabbedBrowserDisplayer displayer(
- profile, chrome::GetActiveDesktop());
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile);
print_dialog_cloud::CreateCloudPrintSigninTab(
displayer.browser(),
add_account,
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index 17d45e9..4b1ad69 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -319,8 +319,8 @@
bool force_new_tab = false;
if (!browser) {
// Settings is not displayed in a browser window. Open a new window.
- browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile_,
- chrome::GetActiveDesktop()));
+ browser =
+ new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile_));
force_new_tab = true;
}
diff --git a/chrome/browser/ui/webui/signin/login_ui_service.cc b/chrome/browser/ui/webui/signin/login_ui_service.cc
index 879362e..4e45149 100644
--- a/chrome/browser/ui/webui/signin/login_ui_service.cc
+++ b/chrome/browser/ui/webui/signin/login_ui_service.cc
@@ -61,8 +61,7 @@
#if defined(OS_CHROMEOS)
NOTREACHED();
#else
- chrome::ScopedTabbedBrowserDisplayer displayer(
- profile_, chrome::GetActiveDesktop());
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
chrome::ShowBrowserSignin(
displayer.browser(),
signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS);
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index 26578412..8399739 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -429,28 +429,25 @@
scoped_ptr<TestingProfile> profile(new TestingProfile());
// Creating a popup handler here to make sure it does not interfere with the
// existing windows.
- Browser::CreateParams native_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams native_params(profile.get());
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
// Creating a popup handler here to make sure it does not interfere with the
// existing windows.
- Browser::CreateParams params2(profile.get(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params2(profile.get());
scoped_ptr<Browser> browser2(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), ¶ms2));
BrowserWindow* browser_window = browser2->window();
// Creating a popup to make sure it does not interfere with the positioning.
- Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get());
scoped_ptr<Browser> browser_popup(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(16, 32, 128, 256), ¶ms_popup));
// Creating a panel to make sure it does not interfere with the positioning.
- Browser::CreateParams params_panel(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params_panel(Browser::TYPE_POPUP, profile.get());
scoped_ptr<Browser> browser_panel(
CreateTestBrowser(CreateTestWindowInShellWithId(2),
gfx::Rect(32, 48, 256, 512), ¶ms_panel));
@@ -506,8 +503,7 @@
TEST_F(WindowSizerAshTest, MAYBE_PlaceNewBrowserWindowOnEmptyDesktop) {
// Create a browser to pass into the GetWindowBoundsAndShowState function.
scoped_ptr<TestingProfile> profile(new TestingProfile());
- Browser::CreateParams native_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams native_params(profile.get());
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
@@ -594,7 +590,7 @@
scoped_ptr<TestingProfile> profile(new TestingProfile());
// Create browser windows that are used as reference.
- Browser::CreateParams params(profile.get(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params(profile.get());
scoped_ptr<Browser> browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(10, 10, 200, 200), ¶ms));
BrowserWindow* browser_window = browser->window();
@@ -602,8 +598,7 @@
browser_window->Show();
EXPECT_EQ(native_window->GetRootWindow(), ash::Shell::GetTargetRootWindow());
- Browser::CreateParams another_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams another_params(profile.get());
scoped_ptr<Browser> another_browser(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(400, 10, 300, 300), &another_params));
@@ -613,8 +608,7 @@
another_browser_window->Show();
// Creating a new window to verify the new placement.
- Browser::CreateParams new_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams new_params(profile.get());
scoped_ptr<Browser> new_browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(), &new_params));
@@ -689,14 +683,12 @@
scoped_ptr<TestingProfile> profile(new TestingProfile());
// Creating a browser & window to play with.
- Browser::CreateParams params(Browser::TYPE_TABBED, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params(Browser::TYPE_TABBED, profile.get());
scoped_ptr<Browser> browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), ¶ms));
// Create also a popup browser since that behaves different.
- Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get());
scoped_ptr<Browser> browser_popup(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(16, 32, 640, 320), ¶ms_popup));
@@ -728,8 +720,7 @@
// Now create a top level window and check again for both. Only the tabbed
// window should follow the top level window's state.
// Creating a browser & window to play with.
- Browser::CreateParams params2(Browser::TYPE_TABBED, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params2(Browser::TYPE_TABBED, profile.get());
scoped_ptr<Browser> browser2(CreateTestBrowser(
CreateTestWindowInShellWithId(3), gfx::Rect(16, 32, 640, 320), ¶ms2));
@@ -765,15 +756,13 @@
// Creating a browser & window to play with.
scoped_ptr<TestingProfile> profile(new TestingProfile());
- Browser::CreateParams params(Browser::TYPE_TABBED, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params(Browser::TYPE_TABBED, profile.get());
scoped_ptr<Browser> browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), ¶ms));
// Create also a popup browser since that behaves slightly different for
// defaults.
- Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get());
scoped_ptr<Browser> browser_popup(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(16, 32, 128, 256), ¶ms_popup));
@@ -824,8 +813,7 @@
TEST_F(WindowSizerAshTest, DefaultStateBecomesMaximized) {
// Create a browser to pass into the GetWindowBounds function.
scoped_ptr<TestingProfile> profile(new TestingProfile());
- Browser::CreateParams native_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams native_params(profile.get());
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
@@ -894,8 +882,8 @@
TEST_F(WindowSizerAshTest, TrustedPopupBehavior) {
scoped_ptr<TestingProfile> profile(new TestingProfile());
- Browser::CreateParams trusted_popup_create_params(
- Browser::TYPE_POPUP, profile.get(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams trusted_popup_create_params(Browser::TYPE_POPUP,
+ profile.get());
trusted_popup_create_params.trusted_source = true;
scoped_ptr<Browser> trusted_popup(CreateTestBrowser(
