Rework the way Widget::Init works:

views/widget/widget.h

 // Copyright (c) 2011 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 VIEWS_WIDGET_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/native_widget_delegate.h"
 
 namespace gfx {
 class Canvas;
 class Path;
 class Point;
 class Rect;
 }
 
@@ skipping 29 matching lines @@
 //  TODO(beng): Note that this class being non-abstract means that we have a
 //              violation of Google style in that we are using multiple
 //              inheritance. The intention is to split this into a separate
 //              object associated with but not equal to a NativeWidget
 //              implementation. Multiple inheritance is required for this
 //              transitional step.
 //
 class Widget : public internal::NativeWidgetDelegate,
                public FocusTraversable {
  public:
+  // TODO(beng): Rename to InitParams now this is required for Init().
   struct CreateParams {
     enum Type {
       TYPE_WINDOW,      // A Window, like a frame window.
       TYPE_CONTROL,     // A control, like a button.
       TYPE_POPUP,       // An undecorated Window, with transient properties.
       TYPE_MENU         // An undecorated Window, with transient properties
                         // specialized to menus.
     };
 
     CreateParams();
     explicit CreateParams(Type type);
 
     Type type;
-
     bool child;
     bool transparent;
     bool accept_events;
     bool can_activate;
     bool keep_on_top;
     bool delete_on_destroy;
     bool mirror_origin_in_rtl;
     bool has_dropshadow;
+    gfx::NativeView parent;
+    Widget* parent_widget;
+    gfx::Rect bounds;
     NativeWidget* native_widget;
   };
+  static CreateParams WindowCreateParams();
 
   Widget();
   virtual ~Widget();
 
   // Creates a Widget instance with the supplied params.
-  static Widget* CreateWidget(const CreateParams& params);
+  static Widget* CreateWidget();
 
   // Enumerates all windows pertaining to us and notifies their
   // view hierarchies that the locale has changed.
   static void NotifyLocaleChanged();
 
   // Converts a rectangle from one Widget's coordinate system to another's.
   // Returns false if the conversion couldn't be made, because either these two
   // Widgets do not have a common ancestor or they are not on the screen yet.
   // The value of |*rect| won't be changed when false is returned.
   static bool ConvertRect(const Widget* source,
                           const Widget* target,
                           gfx::Rect* rect);
 
-  // Sets the creation params for the Widget.
-  void SetCreateParams(const CreateParams& params);
+  void Init(const CreateParams& params);
 
   // Unconverted methods -------------------------------------------------------
 
   // TODO(beng):
   // Widget subclasses are still implementing these methods by overriding from
   // here rather than by implementing NativeWidget.
 
-  // Initialize the Widget with a parent and an initial desired size.
-  // |contents_view| is the view that will be the single child of RootView
-  // within this Widget. As contents_view is inserted into RootView's tree,
-  // RootView assumes ownership of this view and cleaning it up. If you remove
-  // this view, you are responsible for its destruction. If this value is NULL,
-  // the caller is responsible for populating the RootView, and sizing its
-  // contents as the window is sized.
-  virtual void Init(gfx::NativeView parent, const gfx::Rect& bounds);
-  virtual void InitWithWidget(Widget* parent, const gfx::Rect& bounds);
-
   // Returns the gfx::NativeView associated with this Widget.
   virtual gfx::NativeView GetNativeView() const;
 
   // Starts a drag operation for the specified view. |point| is a position in
   // |view| coordinates that the drag was initiated from.
   virtual void GenerateMousePressedForView(View* view,
                                            const gfx::Point& point);
 
   // Returns the accelerator given a command id. Returns false if there is
   // no accelerator associated with a given id, which is a common condition.
@@ skipping 233 matching lines @@
 
   // The compositor for accelerated drawing.
   scoped_refptr<ui::Compositor> compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_