Allow the Views Delegate to provide the native widget.

ui/views/widget/widget.cc

 // 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.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/events/event.h"
@@ skipping 30 matching lines @@
 // views that are direct children of the Widgets layer.
 void BuildRootLayers(View* view, std::vector<ui::Layer*>* layers) {
   if (view->layer()) {
     layers->push_back(view->layer());
   } else {
     for (int i = 0; i < view->child_count(); ++i)
       BuildRootLayers(view->child_at(i), layers);
   }
 }
 
+// Create a native widget implementation.
+// First, use the supplied one if non-NULL.
+// Second, ask the delegate.
+// Finally, make a default one.
+NativeWidget* CreateNativeWidget(NativeWidget* native_widget,
+                                 internal::NativeWidgetDelegate* delegate,
+                                 gfx::NativeView parent) {
+  if (!native_widget) {
+    if (ViewsDelegate::views_delegate) {
+      native_widget =
+          ViewsDelegate::views_delegate->CreateNativeWidget(delegate, parent);
+    }
+    if (!native_widget) {
+      native_widget =
+          internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
+    }
+  }
+  return native_widget;
+}
+
 }  // namespace
 
 // This class is used to keep track of the event a Widget is processing, and
 // restore any previously active event afterwards.
 class ScopedEvent {
  public:
   ScopedEvent(Widget* widget, const ui::Event& event)
       : widget_(widget),
         event_(&event) {
     widget->event_stack_.push(this);
@@ skipping 241 matching lines @@
 }
 
 void Widget::Init(const InitParams& params) {
   is_top_level_ = params.top_level ||
       (!params.child &&
        params.type != InitParams::TYPE_CONTROL &&
        params.type != InitParams::TYPE_TOOLTIP);
   widget_delegate_ = params.delegate ?
       params.delegate : new DefaultWidgetDelegate(this, params);
   ownership_ = params.ownership;
-  native_widget_ = params.native_widget ?
-      params.native_widget->AsNativeWidgetPrivate() :
-      internal::NativeWidgetPrivate::CreateNativeWidget(this);
+  native_widget_ =
+      CreateNativeWidget(params.native_widget, this, params.GetParent())->
+          AsNativeWidgetPrivate();
   GetRootView();
   default_theme_provider_.reset(new DefaultThemeProvider);
   if (params.type == InitParams::TYPE_MENU) {
     is_mouse_button_pressed_ =
         internal::NativeWidgetPrivate::IsMouseButtonDown();
   }
   native_widget_->InitNativeWidget(params);
   if (RequiresNonClientView(params.type)) {
     non_client_view_ = new NonClientView;
     non_client_view_->SetFrameView(CreateNonClientFrameView());
@@ skipping 1002 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views