Remove dispatcher when shutting down RootWindowController

ash/display/screen_ash.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/screen_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
@@ skipping 215 matching lines @@
   return GetDisplayManager()->displays();
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
   if (!window)
     return GetPrimaryDisplay();
   const aura::Window* root_window = window->GetRootWindow();
   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
   // for non desktop display.
   if (display_manager->non_desktop_display().id() == id)
     return display_manager->non_desktop_display();
   return display_manager->GetDisplayForId(id);
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestPoint(const gfx::Point& point) const {
@@ skipping 27 matching lines @@
 
 void ScreenAsh::RemoveObserver(gfx::DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 gfx::Screen* ScreenAsh::CloneForShutdown() {
   return new ScreenForShutdown(this);
 }
 
 }  // namespace ash