Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc |
index 0a8596d836d1e97a22391e7966aa3e593359284e..0670007ef4104fd9e2947b25b9a4637adf48044b 100644 |
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc |
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc |
@@ -765,6 +765,10 @@ void DesktopWindowTreeHostWin::HandleCreate() { |
void DesktopWindowTreeHostWin::HandleDestroying() { |
drag_drop_client_->OnNativeWidgetDestroying(GetHWND()); |
native_widget_delegate_->OnNativeWidgetDestroying(); |
+ |
+ // Destroy the compositor before destroying the HWND since shutdown |
+ // may try to swap to the window. |
+ DestroyCompositor(); |
} |
void DesktopWindowTreeHostWin::HandleDestroyed() { |