Chromium Code Reviews| 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..22f281f09cce988740999015145c09d9ed331a00 100644 |
| --- a/ui/views/mus/mus_client.cc |
| +++ b/ui/views/mus/mus_client.cc |
| @@ -79,13 +79,18 @@ 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 |
|
msw
2016/11/11 00:29:24
nit: keeps some comment about returning null to us
sky
2016/11/11 01:09:13
Done.
|
| - // used instead. |
| - if (init_params.type == Widget::InitParams::TYPE_CONTROL) |
| + if (!ShouldCreateDesktopNativeWidgetAura(init_params)) |
| return nullptr; |
| DesktopNativeWidgetAura* native_widget = |