Index: ash/display/screen_ash.cc |
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc |
index 9bdb920a1d8502aabae9adba3ddba7a3c297d53d..02cf9c05016aff6eafc62bebef76358a650a018c 100644 |
--- a/ash/display/screen_ash.cc |
+++ b/ash/display/screen_ash.cc |
@@ -232,7 +232,11 @@ gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const { |
const aura::Window* root_window = window->GetRootWindow(); |
if (!root_window) |
return GetPrimaryDisplay(); |
- int64 id = internal::GetRootWindowSettings(root_window)->display_id; |
+ const internal::RootWindowSettings* rws = |
+ internal::GetRootWindowSettings(root_window); |
+ if (rws->shutdown) |
+ return gfx::Display(1); |
+ int64 id = rws->display_id; |
// if id is |kInvaildDisplayID|, it's being deleted. |
DCHECK(id != gfx::Display::kInvalidDisplayID); |