Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: ui/views/widget/widget.cc

Issue 10913237: Allow the Views Delegate to provide the native widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/desktop_native_widget_aura.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
===================================================================
--- ui/views/widget/widget.cc (revision 156649)
+++ ui/views/widget/widget.cc (working copy)
@@ -48,6 +48,26 @@
}
}
+// 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
@@ -309,9 +329,9 @@
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) {
« no previous file with comments | « ui/views/widget/desktop_native_widget_aura.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698