| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index 1790b0672d5759e3ce07341e6f3e998d8a835bb4..427dbada5b13c821720de55c380f4af65319d3ce 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -293,39 +293,31 @@ content::SecurityStyle SecurityLevelToSecurityStyle(
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // 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 @@ Browser::CreateParams Browser::CreateParams::CreateForApp(
|
|
|
| // 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 @@ Browser::Browser(const CreateParams& params)
|
| 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)),
|
|
|