| 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);
|
|
|