mash: Avoid shelf crashes on display removal.

ash/display/unified_mouse_warp_controller.cc

 // Copyright 2015 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/unified_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
@@ skipping 21 matching lines @@
       ->window_tree_host_manager()
       ->mirror_window_controller()
       ->GetAshWindowTreeHostForDisplayId(display_id);
 }
 
 #if defined(USE_OZONE)
 // Find a WindowTreeHost used for mirroring displays that contains
 // the |point_in_screen|. Returns nullptr if such WTH does not exist.
 aura::WindowTreeHost* FindMirroringWindowTreeHostFromScreenPoint(
     const gfx::Point& point_in_screen) {
-  display::DisplayList mirroring_display_list =
+  display::Displays mirroring_display_list =
       Shell::GetInstance()
           ->display_manager()
           ->software_mirroring_display_list();
   int index = display::FindDisplayIndexContainingPoint(mirroring_display_list,
                                                        point_in_screen);
   if (index < 0)
     return nullptr;
   return GetMirroringAshWindowTreeHostForDisplayId(
              mirroring_display_list[index].id())
       ->AsWindowTreeHost();
@@ skipping 18 matching lines @@
   gfx::Point point_in_unified_host = event->location();
   ::wm::ConvertPointToScreen(target, &point_in_unified_host);
   // The display bounds of the mirroring windows isn't scaled, so
   // transform back to the host coordinates.
   target->GetHost()->GetRootTransform().TransformPoint(&point_in_unified_host);
 
   if (current_cursor_display_id_ != display::Display::kInvalidDisplayID) {
     aura::client::CursorClient* cursor_client =
         aura::client::GetCursorClient(target->GetRootWindow());
     if (cursor_client) {
-      display::DisplayList mirroring_display_list =
+      display::Displays mirroring_display_list =
           Shell::GetInstance()
               ->display_manager()
               ->software_mirroring_display_list();
       int index = display::FindDisplayIndexContainingPoint(
           mirroring_display_list, point_in_unified_host);
       if (index >= 0) {
         const display::Display& new_display = mirroring_display_list[index];
         if (current_cursor_display_id_ != new_display.id()) {
           cursor_client->SetDisplay(new_display);
           current_cursor_display_id_ = display::Display::kInvalidDisplayID;
@@ skipping 23 matching lines @@
 
   return WarpMouseCursorInNativeCoords(point_in_native, point_in_unified_host,
                                        update_location_for_test_);
 }
 
 void UnifiedMouseWarpController::SetEnabled(bool enabled) {
   // Mouse warp shuld be always on in Unified mode.
 }
 
 void UnifiedMouseWarpController::ComputeBounds() {
-  display::DisplayList display_list = Shell::GetInstance()
-                                          ->display_manager()
-                                          ->software_mirroring_display_list();
+  display::Displays display_list = Shell::GetInstance()
+                                       ->display_manager()
+                                       ->software_mirroring_display_list();
 
   if (display_list.size() < 2) {
     LOG(ERROR) << "Mirroring Display lost during re-configuration";
     return;
   }
   LOG_IF(ERROR, display_list.size() > 2) << "Only two displays are supported";
 
   const display::Display& first = display_list[0];
   const display::Display& second = display_list[1];
   bool success =
@@ skipping 11 matching lines @@
 }
 
 bool UnifiedMouseWarpController::WarpMouseCursorInNativeCoords(
     const gfx::Point& point_in_native,
     const gfx::Point& point_in_unified_host,
     bool update_mouse_location_now) {
   bool in_first_edge = first_edge_bounds_in_native_.Contains(point_in_native);
   bool in_second_edge = second_edge_bounds_in_native_.Contains(point_in_native);
   if (!in_first_edge && !in_second_edge)
     return false;
-  display::DisplayList display_list = Shell::GetInstance()
-                                          ->display_manager()
-                                          ->software_mirroring_display_list();
+  display::Displays display_list = Shell::GetInstance()
+                                       ->display_manager()
+                                       ->software_mirroring_display_list();
   // Wait updating the cursor until the cursor moves to the new display
   // to avoid showing the wrong sized cursor at the source display.
   current_cursor_display_id_ =
       in_first_edge ? display_list[0].id() : display_list[1].id();
   AshWindowTreeHost* target_ash_host =
       GetMirroringAshWindowTreeHostForDisplayId(
           in_first_edge ? display_list[1].id() : display_list[0].id());
   MoveCursorTo(target_ash_host, point_in_unified_host,
                update_mouse_location_now);
   return true;
 }
 
 }  // namespace ash