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

Issues Search
    My Issues | Starred     Open | Closed | All

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
« no previous file with comments | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/host/ash_window_tree_host.h » ('j') | ash/host/ash_window_tree_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_ash.cc
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index 9d42e49e26724dc8ee03b2daa08fc3eb282b9539..4c5d2a9c1b8f0f00620c93cb53f97a88801859f4 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -233,12 +233,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)
sadrul 2014/05/21 19:01:49 Did you mean id == invalid here?
oshima 2014/05/22 17:03:13 oops, fixed. thanks.
+ return GetPrimaryDisplay();
DisplayManager* display_manager = GetDisplayManager();
// RootWindow needs Display to determine its device scale factor
« no previous file with comments | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/host/ash_window_tree_host.h » ('j') | ash/host/ash_window_tree_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698