Rework the way Widget::Init works:

views/examples/widget_example.cc

 // 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.
 
 #include "views/examples/widget_example.h"
 
 #include "views/controls/button/native_button.h"
 #include "views/layout/box_layout.h"
 #include "views/layout/layout_manager.h"
 #include "views/view.h"
@@ skipping 90 matching lines @@
     widget_container->set_background(
         views::Background::CreateStandardPanelBackground());
   }
 
   // Show the widget.
   widget->Show();
 }
 
 #if defined(OS_LINUX)
 void WidgetExample::CreateChild(views::View* parent, bool transparent) {
-  views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_CONTROL);
-  params.transparent = transparent;
-  views::Widget* widget = views::Widget::CreateWidget(params);
+  views::Widget* widget = views::Widget::CreateWidget();
   // Compute where to place the child widget.
   // We'll place it at the center of the root widget.
   views::Widget* parent_widget = parent->GetWidget();
   gfx::Rect bounds = parent_widget->GetClientAreaScreenBounds();
   // Child widget is 200x200 square.
   bounds.SetRect((bounds.width() - 200) / 2, (bounds.height() - 200) / 2,
       200, 200);
   // Initialize the child widget with the computed bounds.
-  widget->InitWithWidget(parent_widget, bounds);
+  views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_CONTROL);
+  params.transparent = transparent;
+  params.parent_widget = parent_widget;
+  widget->Init(params);
   InitWidget(widget, transparent);
 }
 #endif
 
 void WidgetExample::CreatePopup(views::View* parent, bool transparent) {
-  views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_POPUP);
-  params.transparent = transparent;
-  views::Widget* widget = views::Widget::CreateWidget(params);
+  views::Widget* widget = views::Widget::CreateWidget();
 
   // Compute where to place the popup widget.
   // We'll place it right below the create button.
   gfx::Point point = parent->GetMirroredPosition();
   // The position in point is relative to the parent. Make it absolute.
   views::View::ConvertPointToScreen(parent, &point);
   // Add the height of create_button_.
   point.Offset(0, parent->size().height());
-  gfx::Rect bounds(point.x(), point.y(), 200, 300);
+
   // Initialize the popup widget with the computed bounds.
-  widget->InitWithWidget(parent->GetWidget(), bounds);
+  views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_POPUP);
+  params.transparent = transparent;
+  params.parent_widget = parent->GetWidget();
+  params.bounds = gfx::Rect(point.x(), point.y(), 200, 300);
+  widget->Init(params);
   InitWidget(widget, transparent);
 }
 
 void WidgetExample::ButtonPressed(views::Button* sender,
                                   const views::Event& event) {
   switch (sender->tag()) {
     case POPUP:
       CreatePopup(sender, false);
       break;
     case TRANSPARENT_POPUP:
       CreatePopup(sender, true);
       break;
 #if defined(OS_LINUX)
     case CHILD:
       CreateChild(sender, false);
       break;
     case TRANSPARENT_CHILD:
       CreateChild(sender, true);
       break;
 #endif
     case CLOSE_WIDGET:
       sender->GetWidget()->Close();
       break;
   }
 }
 
 }  // namespace examples