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

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

Issue 1390353007: Adds MUSViewsInit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows Created 5 years, 2 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/views_delegate.cc ('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
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index e1fc508d798f0d5ca94f7ee9050a231c2c09ccb9..189522a6219940379ee69cd9dc74813c2c5bc858 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -59,8 +59,14 @@ void BuildRootLayers(View* view, std::vector<ui::Layer*>* layers) {
NativeWidget* CreateNativeWidget(NativeWidget* native_widget,
internal::NativeWidgetDelegate* delegate) {
if (!native_widget) {
- native_widget =
- internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
+ if (ViewsDelegate::GetInstance()) {
+ native_widget = ViewsDelegate::GetInstance()->CreateNativeWidget(
+ delegate);
+ }
+ if (!native_widget) {
+ native_widget =
+ internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
+ }
}
return native_widget;
}
« no previous file with comments | « ui/views/views_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698