Consolidate Browser Creation.

chrome/browser/ui/browser_navigator.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_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 40 matching lines @@
 // those types of Browser.
 bool WindowCanOpenTabs(Browser* browser) {
   return browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP) ||
       browser->tab_strip_model()->empty();
 }
 
 // Finds an existing Browser compatible with |profile|, making a new one if no
 // such Browser is located.
 Browser* GetOrCreateBrowser(Profile* profile) {
   Browser* browser = browser::FindTabbedBrowser(profile, false);
-  return browser ? browser : Browser::Create(profile);
+  return browser ? browser : new Browser(Browser::CreateParams(profile));
 }
 
 // Change some of the navigation parameters based on the particular URL.
 // Currently this applies to some chrome:// pages which we always want to open
 // in a non-incognito window. Note that even though a ChromeOS guest session is
 // technically an incognito window, these URLs are allowed.
 // Returns true on success. Otherwise, if changing params leads the browser into
 // an erroneous state, returns false.
 bool AdjustNavigateParamsForURL(chrome::NavigateParams* params) {
   if (params->target_contents != NULL ||
@@ skipping 58 matching lines @@
         app_name = params->browser->app_name();
       } else if (params->source_contents &&
                  params->source_contents->extension_tab_helper()->is_app()) {
         app_name = web_app::GenerateApplicationNameFromExtensionId(
             params->source_contents->extension_tab_helper()->
                 extension_app()->id());
       }
       if (app_name.empty()) {
         Browser::CreateParams browser_params(Browser::TYPE_POPUP, profile);
         browser_params.initial_bounds = params->window_bounds;
-        return Browser::CreateWithParams(browser_params);
+        return new Browser(browser_params);
       }
 
-      return Browser::CreateWithParams(
-          Browser::CreateParams::CreateForApp(
-              Browser::TYPE_POPUP, app_name, params->window_bounds,
-              profile));
+      return new Browser(Browser::CreateParams::CreateForApp(
+          Browser::TYPE_POPUP, app_name, params->window_bounds, profile));
     }
     case NEW_WINDOW: {
       // Make a new normal browser window.
-      Browser* browser = new Browser(Browser::TYPE_TABBED, profile);
-      browser->InitBrowserWindow();
-      return browser;
+      return new Browser(Browser::CreateParams(profile));
     }
     case OFF_THE_RECORD:
       // Make or find an incognito window.
       return GetOrCreateBrowser(profile->GetOffTheRecordProfile());
     // The following types all result in no navigation.
     case SUPPRESS_OPEN:
     case SAVE_TO_DISK:
     case IGNORE_ACTION:
       return NULL;
     default:
@@ skipping 425 matching lines @@
   return !(url.scheme() == chrome::kChromeUIScheme &&
       (url.host() == chrome::kChromeUISettingsHost ||
        url.host() == chrome::kChromeUISettingsFrameHost ||
        url.host() == chrome::kChromeUIExtensionsHost ||
        url.host() == chrome::kChromeUIBookmarksHost ||
        url.host() == chrome::kChromeUISyncPromoHost ||
        url.host() == chrome::kChromeUIUberHost));
 }
 
 }  // namespace chrome