Rework the way Widget::Init works:

views/widget/widget_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/widget/widget_win.h"
 
 #include <dwmapi.h>
 
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
@@ skipping 176 matching lines @@
       it != accessibility_view_events_.end();
       ++it) {
     if (*it == view)
       *it = NULL;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetWin, Widget implementation:
 
-void WidgetWin::Init(gfx::NativeView parent, const gfx::Rect& bounds) {
-  Widget::Init(parent, bounds);
-
-  // Create the window.
-  WindowImpl::Init(parent, bounds);
-}
-
-void WidgetWin::InitWithWidget(Widget* parent, const gfx::Rect& bounds) {
-  Init(parent->GetNativeView(), bounds);
-}
-
 gfx::NativeView WidgetWin::GetNativeView() const {
   return WindowImpl::hwnd();
 }
 
 bool WidgetWin::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   return false;
 }
 
 Window* WidgetWin::GetWindow() {
   return GetWindowImpl(hwnd());
 }
 
 const Window* WidgetWin::GetWindow() const {
   return GetWindowImpl(hwnd());
 }
 
 void WidgetWin::ViewHierarchyChanged(bool is_add, View* parent,
                                      View* child) {
   Widget::ViewHierarchyChanged(is_add, parent, child);
   if (drop_target_.get())
     drop_target_->ResetTargetViewIfEquals(child);
 
   if (!is_add)
     ClearAccessibilityViewEvent(child);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetWin, NativeWidget implementation:
 
-void WidgetWin::SetCreateParams(const CreateParams& params) {
-  DCHECK(!GetNativeView());
+void WidgetWin::InitNativeWidget(const Widget::CreateParams& params) {
+  SetCreateParams(params);
 
-  // Set non-style attributes.
-  delete_on_destroy_ = params.delete_on_destroy;
-
-  DWORD style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
-  DWORD ex_style = 0;
-  DWORD class_style = CS_DBLCLKS;
-
-  // Set type-independent style attributes.
-  if (params.child)
-    style |= WS_CHILD | WS_VISIBLE;
-  if (!params.accept_events)
-    ex_style |= WS_EX_TRANSPARENT;
-  if (!params.can_activate)
-    ex_style |= WS_EX_NOACTIVATE;
-  if (params.keep_on_top)
-    ex_style |= WS_EX_TOPMOST;
-  if (params.mirror_origin_in_rtl)
-    ex_style |= l10n_util::GetExtendedTooltipStyles();
-  if (params.transparent)
-    ex_style |= WS_EX_LAYERED;
-  if (params.has_dropshadow) {
-    class_style |= (base::win::GetVersion() < base::win::VERSION_XP) ?
-        0 : CS_DROPSHADOW;
-  }
-
-  // Set type-dependent style attributes.
-  switch (params.type) {
-    case CreateParams::TYPE_WINDOW:
-    case CreateParams::TYPE_CONTROL:
-      break;
-    case CreateParams::TYPE_POPUP:
-      style |= WS_POPUP;
-      ex_style |= WS_EX_TOOLWINDOW;
-      break;
-    case CreateParams::TYPE_MENU:
-      style |= WS_POPUP;
-      is_mouse_button_pressed_ =
-          ((GetKeyState(VK_LBUTTON) & 0x80) ||
-          (GetKeyState(VK_RBUTTON) & 0x80) ||
-          (GetKeyState(VK_MBUTTON) & 0x80) ||
-          (GetKeyState(VK_XBUTTON1) & 0x80) ||
-          (GetKeyState(VK_XBUTTON2) & 0x80));
-      break;
-    default:
-      NOTREACHED();
-  }
-
-  set_initial_class_style(class_style);
-  set_window_style(style);
-  set_window_ex_style(ex_style);
+  // Create the window.
+  gfx::NativeView parent = params.parent_widget ?
+      params.parent_widget->GetNativeView() : params.parent;
+  WindowImpl::Init(parent, params.bounds);
 }
 
 Widget* WidgetWin::GetWidget() {
   return this;
 }
 
 void WidgetWin::SetNativeWindowProperty(const char* name, void* value) {
   // Remove the existing property (if any).
   for (ViewProps::iterator i = props_.begin(); i != props_.end(); ++i) {
     if ((*i)->Key() == name) {
@@ skipping 721 matching lines @@
   while (parent) {
     WidgetWin* widget =
         reinterpret_cast<WidgetWin*>(ui::GetWindowUserData(parent));
     if (widget && widget->is_window_)
       return static_cast<WindowWin*>(widget);
     parent = ::GetParent(parent);
   }
   return NULL;
 }
 
+void WidgetWin::SetCreateParams(const CreateParams& params) {
+  // Set non-style attributes.
+  delete_on_destroy_ = params.delete_on_destroy;
+
+  DWORD style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+  DWORD ex_style = 0;
+  DWORD class_style = CS_DBLCLKS;
+
+  // Set type-independent style attributes.
+  if (params.child)
+    style |= WS_CHILD | WS_VISIBLE;
+  if (!params.accept_events)
+    ex_style |= WS_EX_TRANSPARENT;
+  if (!params.can_activate)
+    ex_style |= WS_EX_NOACTIVATE;
+  if (params.keep_on_top)
+    ex_style |= WS_EX_TOPMOST;
+  if (params.mirror_origin_in_rtl)
+    ex_style |= l10n_util::GetExtendedTooltipStyles();
+  if (params.transparent)
+    ex_style |= WS_EX_LAYERED;
+  if (params.has_dropshadow) {
+    class_style |= (base::win::GetVersion() < base::win::VERSION_XP) ?
+        0 : CS_DROPSHADOW;
+  }
+
+  // Set type-dependent style attributes.
+  switch (params.type) {
+    case CreateParams::TYPE_WINDOW:
+    case CreateParams::TYPE_CONTROL:
+      break;
+    case CreateParams::TYPE_POPUP:
+      style |= WS_POPUP;
+      ex_style |= WS_EX_TOOLWINDOW;
+      break;
+    case CreateParams::TYPE_MENU:
+      style |= WS_POPUP;
+      is_mouse_button_pressed_ =
+          ((GetKeyState(VK_LBUTTON) & 0x80) ||
+          (GetKeyState(VK_RBUTTON) & 0x80) ||
+          (GetKeyState(VK_MBUTTON) & 0x80) ||
+          (GetKeyState(VK_XBUTTON1) & 0x80) ||
+          (GetKeyState(VK_XBUTTON2) & 0x80));
+      break;
+    default:
+      NOTREACHED();
+  }
+
+  set_initial_class_style(class_style);
+  set_window_style(window_style() | style);
+  set_window_ex_style(window_ex_style() | ex_style);
+}
+
 RootView* WidgetWin::GetFocusedViewRootView() {
   // TODO(beng): get rid of this
   FocusManager* focus_manager = GetFocusManager();
   if (!focus_manager) {
     NOTREACHED();
     return NULL;
   }
   View* focused_view = focus_manager->GetFocusedView();
   if (!focused_view)
     return NULL;
@@ skipping 89 matching lines @@
   if (!root_view)
     root_view = GetRootView();
 
   SetMsgHandled(root_view->ProcessKeyEvent(key));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 // static
-Widget* Widget::CreateWidget(const CreateParams& params) {
-  WidgetWin* widget = new WidgetWin;
-  widget->SetCreateParams(params);
-  return widget;
+Widget* Widget::CreateWidget() {
+  return new WidgetWin;
 }
 
 // static
 void Widget::NotifyLocaleChanged() {
   NOTIMPLEMENTED();
 }
 
 bool Widget::ConvertRect(const Widget* source,
                          const Widget* target,
                          gfx::Rect* rect) {
@@ skipping 96 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views