Index: ash/wm/frame_painter.cc |
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc |
index 94b9504a78cae8a54f87e28abcba2e7e471625fc..d544f32da9bab4cd85fb07fe746a0169802b096d 100644 |
--- a/ash/wm/frame_painter.cc |
+++ b/ash/wm/frame_painter.cc |
@@ -546,6 +546,8 @@ bool FramePainter::UseSoloWindowHeader(aura::Window* ignore) const { |
return false; |
const aura::Window* default_container = Shell::GetInstance()->GetContainer( |
internal::kShellWindowId_DefaultContainer); |
+ if (!default_container) |
+ return false; // Shutting down. |
Daniel Erat
2012/03/28 23:58:30
please add a link to the bug
stevenjb
2012/03/29 00:44:18
Done.
|
int normal_window_count = 0; |
const aura::Window::Windows& windows = default_container->children(); |
for (aura::Window::Windows::const_iterator it = windows.begin(); |