Rework the way Widget::Init works:

views/window/window_win.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/window/window_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "base/i18n/rtl.h"
@@ skipping 224 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WindowWin, public:
 
 WindowWin::~WindowWin() {
 }
 
 // static
 Window* Window::CreateChromeWindow(gfx::NativeWindow parent,
                                    const gfx::Rect& bounds,
                                    WindowDelegate* window_delegate) {
-  WindowWin* window = new WindowWin(window_delegate);
-  window->GetWindow()->non_client_view()->SetFrameView(
-      window->CreateFrameViewForWindow());
-  window->Init(parent, bounds);
+  Window* window = new WindowWin(window_delegate);
+  window->non_client_view()->SetFrameView(window->CreateFrameViewForWindow());
+  Widget::CreateParams params(Widget::WindowCreateParams());
+  params.parent = parent;
+  params.bounds = bounds;
+  window->AsWidget()->Init(params);
   return window;
 }
 
 void WindowWin::Show(int show_state) {
   ShowWindow(show_state);
   // When launched from certain programs like bash and Windows Live Messenger,
   // show_state is set to SW_HIDE, so we need to correct that condition. We
   // don't just change show_state to SW_SHOWNORMAL because MSDN says we must
   // always first call ShowWindow with the specified value from STARTUPINFO,
   // otherwise all future ShowWindow calls will be ignored (!!#@@#!). Instead,
@@ skipping 55 matching lines @@
       is_in_size_move_(false) {
   SetNativeWindow(this);
   is_window_ = true;
   InitClass();
   // Initialize these values to 0 so that subclasses can override the default
   // behavior before calling Init.
   set_window_style(0);
   set_window_ex_style(0);
 }
 
-void WindowWin::Init(gfx::NativeView parent, const gfx::Rect& bounds) {
-  if (window_style() == 0)
-    set_window_style(CalculateWindowStyle());
-  if (window_ex_style() == 0)
-    set_window_ex_style(CalculateWindowExStyle());
-
-  GetMonitorAndRects(bounds.ToRECT(), &last_monitor_, &last_monitor_rect_,
-                     &last_work_area_);
-
-  WidgetWin::Init(parent, bounds);
-
-  delegate_->OnNativeWindowCreated(bounds);
-}
-
 gfx::Insets WindowWin::GetClientAreaInsets() const {
   // Returning an empty Insets object causes the default handling in
   // WidgetWin::OnNCCalcSize() to be invoked.
   if (delegate_->IsUsingNativeFrame())
     return gfx::Insets();
 
   if (IsMaximized()) {
     // Windows automatically adds a standard width border to all sides when a
     // window is maximized.
     int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
@@ skipping 14 matching lines @@
   return gfx::Insets(0, 0, IsFullscreen() ? 0 : 1, 0);
 }
 
 int WindowWin::GetShowState() const {
   return SW_SHOWNORMAL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowWin, WidgetWin overrides:
 
+void WindowWin::InitNativeWidget(const Widget::CreateParams& params) {
+  if (window_style() == 0)
+    set_window_style(CalculateWindowStyle());
+  if (window_ex_style() == 0)
+    set_window_ex_style(CalculateWindowExStyle());
+
+  GetMonitorAndRects(params.bounds.ToRECT(), &last_monitor_,
+                     &last_monitor_rect_, &last_work_area_);
+
+  WidgetWin::InitNativeWidget(params);
+
+  delegate_->OnNativeWindowCreated(params.bounds);
+}
+
 void WindowWin::OnActivateApp(BOOL active, DWORD thread_id) {
   if (!active && thread_id != GetCurrentThreadId()) {
     // Another application was activated, we should reset any state that
     // disables inactive rendering now.
     delegate_->EnableInactiveRendering();
     // Update the native frame too, since it could be rendering the non-client
     // area.
     CallDefaultNCActivateHandler(FALSE);
   }
 }
@@ skipping 978 matching lines @@
     Window::CloseSecondaryWidget(native_widget->GetWidget());
   return TRUE;
 }
 }  // namespace
 
 void Window::CloseAllSecondaryWindows() {
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 }
 
 }  // namespace views