diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 20:36:11 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 20:36:11 +0000 |
| commit | 8f5209c89cbd2e2d34ed5719e6f5007ce7a6aba3 (patch) | |
| tree | 024fd96cef44f82ca2b7ff59e37ef19f1939c1ad /ash/display/screen_ash.cc | |
| parent | 78cd68e0d88496f769b46bb789ea19b0ee132e99 (diff) | |
| download | chromium_src-8f5209c89cbd2e2d34ed5719e6f5007ce7a6aba3.zip chromium_src-8f5209c89cbd2e2d34ed5719e6f5007ce7a6aba3.tar.gz chromium_src-8f5209c89cbd2e2d34ed5719e6f5007ce7a6aba3.tar.bz2 | |
Remove dispatcher when shutting down RootWindowController
Resurrecting PrepareForShutdown as it can be implemented onl in ash.
BUG=None
Review URL: https://codereview.chromium.org/294073006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/screen_ash.cc')
| -rw-r--r-- | ash/display/screen_ash.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc index 0348cbe..607784d 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 |