Remove HostDesktopType from Browser::CreateParams

chrome/browser/ui/browser_commands.cc

Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index c2058fbb655b01af0c66eb37f5371a7aa4e42114..6b80e387fa4c16198ca808cacb3ba19b4536e9a6 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -198,8 +198,8 @@ WebContents* GetTabAndRevertIfNecessary(Browser* browser,
     }
     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 @@ int GetContentRestrictions(const Browser* browser) {
   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 @@ void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
 
   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 @@ void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
             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 OpenWindowWithRestoredTabs(Profile* profile,
 }
 
 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 Stop(Browser* browser) {
 }
 
 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 @@ void NewTab(Browser* browser) {
     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 @@ WebContents* DuplicateTabAt(Browser* browser, int index) {
   } 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 @@ void ConvertPopupToTabbedBrowser(Browser* browser) {
   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 @@ void ViewSource(Browser* browser,
         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 @@ void ConvertTabToAppWindow(Browser* browser,
   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;