Desktop aura: Expand what the ViewsDelegate can do to new windows.

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 32 matching lines @@
   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,
-                                 Widget::InitParams::Type type,
-                                 gfx::NativeView parent,
-                                 gfx::NativeView context) {
+                                 internal::NativeWidgetDelegate* delegate) {
   if (!native_widget) {
-    if (ViewsDelegate::views_delegate) {
-      native_widget = ViewsDelegate::views_delegate->CreateNativeWidget(
-          type, delegate, parent, context);
-    }
-    if (!native_widget) {
-      native_widget =
-          internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
-    }
+    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:
@@ skipping 169 matching lines @@
 
 // static
 Widget* Widget::CreateWindowWithParentAndBounds(WidgetDelegate* delegate,
                                                 gfx::NativeWindow parent,
                                                 const gfx::Rect& bounds) {
   Widget* widget = new Widget;
   Widget::InitParams params;
   params.delegate = delegate;
   params.parent = parent;
   params.bounds = bounds;
+  params.top_level = true;
   widget->Init(params);
   return widget;
 }
 
 // static
 Widget* Widget::CreateWindowWithContext(WidgetDelegate* delegate,
                                         gfx::NativeView context) {
   return CreateWindowWithContextAndBounds(delegate, context, gfx::Rect());
 }
 
@@ skipping 64 matching lines @@
                    GetLocalizedContentsHeight(row_resource_id));
 }
 
 // static
 bool Widget::RequiresNonClientView(InitParams::Type type) {
   return type == InitParams::TYPE_WINDOW ||
          type == InitParams::TYPE_PANEL ||
          type == InitParams::TYPE_BUBBLE;
 }
 
-void Widget::Init(const InitParams& params) {
+void Widget::Init(const InitParams& in_params) {
+  InitParams params = in_params;
+  if (ViewsDelegate::views_delegate)
+    ViewsDelegate::views_delegate->OnWidgetInit(&params, this);

[Ben Goodger (Google), 2012/12/13 23:47:41]

OnBeforeWidgetInit perhaps. OnInit makes it sound like a notification that it
was init (at least convention would indicate that).

+
   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_ = CreateNativeWidget(
-      params.native_widget, this, params.type, params.parent, params.context)->
-          AsNativeWidgetPrivate();
+  native_widget_ = CreateNativeWidget(params.native_widget, this)->
+                   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 1023 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views