Consolidate Browser Creation.

chrome/browser/ui/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 137 matching lines @@
     // that would be cancelled.
     DOWNLOAD_CLOSE_BROWSER_SHUTDOWN,
 
     // There are active downloads associated with this incognito profile
     // that would be canceled.
     DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE,
   };
 
   struct CreateParams {
     CreateParams();
+    explicit CreateParams(Profile* profile);
     CreateParams(Type type, Profile* profile);
 
     static CreateParams CreateForApp(Type type,
                                      const std::string& app_name,
                                      const gfx::Rect& window_bounds,
                                      Profile* profile);
 
     static CreateParams CreateForDevTools(Profile* profile);
 
     // The browser type.
@@ skipping 10 matching lines @@
 
     // Type of app (host or child). See description of AppType.
     AppType app_type;
 
     // The bounds of the window to open.
     gfx::Rect initial_bounds;
 
     ui::WindowShowState initial_show_state;
 
     bool is_session_restore;
+
+    // Supply a custom BrowserWindow implementation, to be used instead of the
+    // default. Intended for testing.
+    BrowserWindow* window;
   };
 
   // Constructors, Creation, Showing //////////////////////////////////////////
 
-  // Creates a new browser of the given |type| and for the given |profile|. The
-  // Browser has a NULL window after its construction, InitBrowserWindow must
-  // be called after configuration for window() to be valid.
-  // Avoid using this constructor directly if you can use one of the Create*()
-  // methods below. This applies to almost all non-testing code.
-  Browser(Type type, Profile* profile);
+  explicit Browser(const CreateParams& params);
   virtual ~Browser();
 
-  // Creates a normal tabbed browser with the specified profile. The Browser's
-  // window is created by this function call.
-  static Browser* Create(Profile* profile);
-
-  // Like Create, but creates a browser of the specified parameters.
-  static Browser* CreateWithParams(const CreateParams& params);
-
   // Set overrides for the initial window bounds and maximized state.
   void set_override_bounds(const gfx::Rect& bounds) {
     override_bounds_ = bounds;
   }
   ui::WindowShowState initial_show_state() const { return initial_show_state_; }
   void set_initial_show_state(ui::WindowShowState initial_show_state) {
     initial_show_state_ = initial_show_state;
   }
   // Return true if the initial window bounds have been overridden.
   bool bounds_overridden() const {
     return !override_bounds_.IsEmpty();
   }
   // Set indicator that this browser is being created via session restore.
   // This is used on the Mac (only) to determine animation style when the
   // browser window is shown.
   void set_is_session_restore(bool is_session_restore) {
     is_session_restore_ = is_session_restore;
   }
   bool is_session_restore() const {
     return is_session_restore_;
   }
 
-  // Creates the Browser Window. Prefer to use the static helpers above where
-  // possible. This does not show the window. You need to call window()->Show()
-  // to show it.
-  void InitBrowserWindow();
-
-  // Sets the BrowserWindow. This is intended for tests only.
-  // Use CreateBrowserWindow outside of testing, or the static convenience
-  // methods that create a BrowserWindow for you.
-  void SetWindowForTesting(BrowserWindow* window);
-
   // Accessors ////////////////////////////////////////////////////////////////
 
   Type type() const { return type_; }
   const std::string& app_name() const { return app_name_; }
   AppType app_type() const { return app_type_; }
   Profile* profile() const { return profile_; }
   gfx::Rect override_bounds() const { return override_bounds_; }
 
   // |window()| will return NULL if called before |CreateBrowserWindow()|
   // is done.
@@ skipping 228 matching lines @@
   void ShowFirstRunBubble();
 
   FullscreenController* fullscreen_controller() {
     return fullscreen_controller_.get();
   }
 
   extensions::WindowController* extension_window_controller() const {
     return extension_window_controller_.get();
   }
 
- protected:
-  // Funnel for the factory method in BrowserWindow. This allows subclasses to
-  // set their own window.
-  virtual BrowserWindow* CreateBrowserWindow();
-
  private:
   friend class BrowserTest;
   friend class FullscreenControllerTest;
   FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
   FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest,
                            TabEntersPresentationModeFromWindowed);
@@ skipping 423 matching lines @@
   bool window_has_shown_;
 
   // Currently open color chooser. Non-NULL after OpenColorChooser is called and
   // before DidEndColorChooser is called.
   scoped_ptr<content::ColorChooser> color_chooser_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_