Consolidate Browser Creation.

chrome/browser/ui/browser_commands.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 83 matching lines @@
     case NEW_BACKGROUND_TAB: {
       current_tab = current_tab->Clone();
       browser->tab_strip_model()->AddTabContents(
           current_tab, -1, content::PAGE_TRANSITION_LINK,
           disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_ACTIVE :
                                               TabStripModel::ADD_NONE);
       break;
     }
     case NEW_WINDOW: {
       current_tab = current_tab->Clone();
-      Browser* b = Browser::Create(browser->profile());
+      Browser* b = new Browser(Browser::CreateParams(browser->profile()));
       b->tab_strip_model()->AddTabContents(
           current_tab, -1, content::PAGE_TRANSITION_LINK,
           TabStripModel::ADD_ACTIVE);
       b->window()->Show();
       break;
     }
     default:
       break;
   }
   return current_tab->web_contents();
@@ skipping 132 matching lines @@
     SessionService* session_service =
         SessionServiceFactory::GetForProfile(profile->GetOriginalProfile());
     if (!session_service ||
         !session_service->RestoreIfNecessary(std::vector<GURL>())) {
       OpenEmptyWindow(profile->GetOriginalProfile());
     }
   }
 }
 
 Browser* OpenEmptyWindow(Profile* profile) {
-  Browser* browser = Browser::Create(profile);
+  Browser* browser = new Browser(Browser::CreateParams(profile));
   AddBlankTab(browser, true);
   browser->window()->Show();
   return browser;
 }
 
 void OpenWindowWithRestoredTabs(Profile* profile) {
   TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile);
   if (service)
     service->RestoreMostRecentEntry(NULL);
 }
@@ skipping 232 matching lines @@
     int add_types = TabStripModel::ADD_ACTIVE |
         TabStripModel::ADD_INHERIT_GROUP |
         (pinned ? TabStripModel::ADD_PINNED : 0);
     browser->tab_strip_model()->InsertTabContentsAt(
         index + 1, contents_dupe, add_types);
   } else {
     Browser* browser = NULL;
     if (browser->is_app()) {
       CHECK(!browser->is_type_popup());
       CHECK(!browser->is_type_panel());
-      browser = Browser::CreateWithParams(
+      browser = new Browser(
           Browser::CreateParams::CreateForApp(Browser::TYPE_POPUP,
                                               browser->app_name(),
                                               gfx::Rect(),
                                               browser->profile()));
     } else if (browser->is_type_popup()) {
-      browser = Browser::CreateWithParams(
+      browser = new Browser(
           Browser::CreateParams(Browser::TYPE_POPUP, 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.
     BrowserWindow* new_window = browser->window();
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           browser->window()->GetRestoredBounds().size()));
 
     // We need to show the browser now.  Otherwise ContainerWin assumes the
@@ skipping 13 matching lines @@
 bool CanDuplicateTabAt(Browser* browser, int index) {
   content::NavigationController& nc =
       GetWebContentsAt(browser, index)->GetController();
   return nc.GetWebContents() && nc.GetLastCommittedEntry();
 }
 
 void ConvertPopupToTabbedBrowser(Browser* browser) {
   content::RecordAction(UserMetricsAction("ShowAsTab"));
   TabContents* contents =
       browser->tab_strip_model()->DetachTabContentsAt(browser->active_index());
-  Browser* b = Browser::Create(browser->profile());
+  Browser* b = new Browser(Browser::CreateParams(browser->profile()));
   b->tab_strip_model()->AppendTabContents(contents, true);
   b->window()->Show();
 }
 
 void Exit() {
   content::RecordAction(UserMetricsAction("Exit"));
   browser::AttemptUserExit();
 }
 
 void BookmarkCurrentPage(Browser* browser) {
@@ skipping 358 matching lines @@
   if (browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
     // If this is a tabbed browser, just create a duplicate tab inside the same
     // window next to the tab being duplicated.
     int index = browser->tab_strip_model()->GetIndexOfTabContents(contents);
     int add_types = TabStripModel::ADD_ACTIVE |
         TabStripModel::ADD_INHERIT_GROUP;
     browser->tab_strip_model()->InsertTabContentsAt(index + 1,
                                                     view_source_contents,
                                                     add_types);
   } else {
-    Browser* b = Browser::CreateWithParams(
+    Browser* b = new Browser(
         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.
     BrowserWindow* new_window = b->window();
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           browser->window()->GetRestoredBounds().size()));
 
     // We need to show the browser now. Otherwise ContainerWin assumes the
     // WebContents is invisible and won't size it.
@@ skipping 30 matching lines @@
 
 void ConvertTabToAppWindow(Browser* browser,
                            content::WebContents* contents) {
   const GURL& url = contents->GetController().GetActiveEntry()->GetURL();
   std::string app_name = web_app::GenerateApplicationNameFromURL(url);
 
   int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
   if (index >= 0)
     browser->tab_strip_model()->DetachTabContentsAt(index);
 
-  Browser* app_browser = Browser::CreateWithParams(
+  Browser* app_browser = new Browser(
       Browser::CreateParams::CreateForApp(
           Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile()));
   TabContents* tab_contents = TabContents::FromWebContents(contents);
   if (!tab_contents)
     tab_contents = new TabContents(contents);
   app_browser->tab_strip_model()->AppendTabContents(tab_contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 
 }  // namespace chrome