| Index: ui/views/mus/native_widget_mus.cc
|
| diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
|
| index 9bfd9a5a90565ce1948a3ad462171ab01b83bebd..44e1291fcd5b25c78d862353f75926233c545b1f 100644
|
| --- a/ui/views/mus/native_widget_mus.cc
|
| +++ b/ui/views/mus/native_widget_mus.cc
|
| @@ -1115,11 +1115,11 @@ bool NativeWidgetMus::IsVisible() const {
|
| }
|
|
|
| void NativeWidgetMus::Activate() {
|
| + if (!window_)
|
| + return;
|
| +
|
| static_cast<aura::client::ActivationClient*>(focus_client_.get())
|
| ->ActivateWindow(content_);
|
| - // FocusControllerMus should have focused |window_| when |content_| is
|
| - // activated.
|
| - DCHECK(!window_ || window_->HasFocus());
|
| }
|
|
|
| void NativeWidgetMus::Deactivate() {
|
|
|