| Index: ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
|
| index 71d690f918eccbe2b3b23f909b9f6516d8085537..5be2c0964d449541478ebd9ec6a0a58bfc127313 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
|
| @@ -467,6 +467,9 @@ void DesktopWindowTreeHostX11::SetShape(gfx::NativeRegion native_region) {
|
| }
|
|
|
| void DesktopWindowTreeHostX11::Activate() {
|
| + if (!window_mapped_)
|
| + return;
|
| +
|
| X11DesktopHandler::get()->ActivateWindow(xwindow_);
|
| native_widget_delegate_->AsWidget()->SetInitialFocus();
|
| }
|
|
|