Moves FindDisplayIndexContainingPoint into display

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_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/shell.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
+#include "ui/display/display_finder.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_utils.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
 AshWindowTreeHost* GetMirroringAshWindowTreeHostForDisplayId(
     int64_t display_id) {
   return Shell::GetInstance()
       ->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::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)
+  auto iter = display::FindDisplayContainingPoint(mirroring_display_list,
+                                                  point_in_screen);
+  if (iter == mirroring_display_list.end())
     return nullptr;
-  return GetMirroringAshWindowTreeHostForDisplayId(
-             mirroring_display_list[index].id())
+  return GetMirroringAshWindowTreeHostForDisplayId(iter->id())
       ->AsWindowTreeHost();
 }
 #endif
 
 }  // namespace
 
 UnifiedMouseWarpController::UnifiedMouseWarpController()
     : current_cursor_display_id_(display::kInvalidDisplayId),
       update_location_for_test_(false) {}
 
@@ skipping 13 matching lines @@
   target->GetHost()->GetRootTransform().TransformPoint(&point_in_unified_host);
 
   if (current_cursor_display_id_ != display::kInvalidDisplayId) {
     aura::client::CursorClient* cursor_client =
         aura::client::GetCursorClient(target->GetRootWindow());
     if (cursor_client) {
       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::kInvalidDisplayId;
-        }
+      auto iter = display::FindDisplayContainingPoint(mirroring_display_list,
+                                                      point_in_unified_host);
+      if (iter != mirroring_display_list.end() &&
+          current_cursor_display_id_ != iter->id()) {
+        cursor_client->SetDisplay(*iter);
+        current_cursor_display_id_ = display::kInvalidDisplayId;
       }
     }
   }
 
   // A native event may not exist in unit test.
   if (!event->HasNativeEvent())
     return false;
 
   gfx::Point point_in_native =
       ui::EventSystemLocationFromNative(event->native_event());
@@ skipping 63 matching lines @@
       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