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

Unified Diff: ui/views/mus/mus_client.cc

Issue 2488393003: Changes views_aura_mus_unittests to create DesktopNativeWidgetAura (Closed)
Patch Set: remove this and fix mac Created 4 years, 1 month 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/mus/mus_client.h ('k') | ui/views/mus/views_aura_mus_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 1f093fbf8f5526bbafff016f70034f5fdb13150f..3273186234e66d0892ec72a09fcd4194a9d244c1 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -79,14 +79,21 @@ MusClient::~MusClient() {
instance_ = nullptr;
}
+// static
+bool MusClient::ShouldCreateDesktopNativeWidgetAura(
+ const Widget::InitParams& init_params) {
+ // TYPE_CONTROL and child widgets require a NativeWidgetAura.
+ return init_params.type != Widget::InitParams::TYPE_CONTROL &&
+ !init_params.child;
+}
+
NativeWidget* MusClient::CreateNativeWidget(
const Widget::InitParams& init_params,
internal::NativeWidgetDelegate* delegate) {
- // TYPE_CONTROL widgets require a NativeWidgetAura. So we let this fall
- // through, so that the default NativeWidgetPrivate::CreateNativeWidget() is
- // used instead.
- if (init_params.type == Widget::InitParams::TYPE_CONTROL)
+ if (!ShouldCreateDesktopNativeWidgetAura(init_params)) {
+ // A null return value results in creating NativeWidgetAura.
return nullptr;
+ }
DesktopNativeWidgetAura* native_widget =
new DesktopNativeWidgetAura(delegate);
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | ui/views/mus/views_aura_mus_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698