Index: ash/display/unified_mouse_warp_controller.cc |
diff --git a/ash/display/unified_mouse_warp_controller.cc b/ash/display/unified_mouse_warp_controller.cc |
index d2c7c4930fa224f7653dfcabc9c44c921f08c4d1..224ef5ad24ccacfbcbed1af4fbc38c42c8679ec8 100644 |
--- a/ash/display/unified_mouse_warp_controller.cc |
+++ b/ash/display/unified_mouse_warp_controller.cc |
@@ -39,7 +39,7 @@ AshWindowTreeHost* GetMirroringAshWindowTreeHostForDisplayId( |
// 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(); |
@@ -78,7 +78,7 @@ bool UnifiedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) { |
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(); |
@@ -122,9 +122,9 @@ void UnifiedMouseWarpController::SetEnabled(bool enabled) { |
} |
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"; |
@@ -156,9 +156,9 @@ bool UnifiedMouseWarpController::WarpMouseCursorInNativeCoords( |
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_ = |