Index: ash/wm/root_window_layout_manager.cc |
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc |
index b84c07a8b6e159bbd9c199f285baadbc70553a9c..2f7efda5ead1b8b6f958d119aa7d1feff652a081 100644 |
--- a/ash/wm/root_window_layout_manager.cc |
+++ b/ash/wm/root_window_layout_manager.cc |
@@ -6,6 +6,7 @@ |
#include "ash/desktop_background/desktop_background_widget_controller.h" |
#include "ash/root_window_controller.h" |
+#include "ash/root_window_settings.h" |
#include "ui/aura/window_event_dispatcher.h" |
#include "ui/compositor/layer.h" |
#include "ui/views/widget/widget.h" |
@@ -28,6 +29,10 @@ RootWindowLayoutManager::~RootWindowLayoutManager() { |
// RootWindowLayoutManager, aura::LayoutManager implementation: |
void RootWindowLayoutManager::OnWindowResized() { |
+ // X event may arrive during shutdown. |
+ if (GetRootWindowSettings(owner_->GetRootWindow())->shutdown) |
+ return; |
+ |
gfx::Rect fullscreen_bounds = |
gfx::Rect(owner_->bounds().width(), owner_->bounds().height()); |