Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2010)

Unified Diff: ash/display/screen_ash.cc

Issue 294073006: Remove dispatcher when shutting down RootWindowController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/display/screen_ash.cc
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index 0348cbe26ace11d2ad7a4bb5466bf813bf1ac94a..607784dd8fc6088e878414a5ba4a213c7ec09c68 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -235,12 +235,11 @@ gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
if (!root_window)
return GetPrimaryDisplay();
const RootWindowSettings* rws = GetRootWindowSettings(root_window);
- if (rws->shutdown)
- return GetPrimaryDisplay();
-
int64 id = rws->display_id;
// if id is |kInvaildDisplayID|, it's being deleted.
DCHECK(id != gfx::Display::kInvalidDisplayID);
+ if (id == gfx::Display::kInvalidDisplayID)
+ return GetPrimaryDisplay();
DisplayManager* display_manager = GetDisplayManager();
// RootWindow needs Display to determine its device scale factor

Powered by Google App Engine
This is Rietveld 408576698