Moves FindDisplayIndexContainingPoint into display

ui/display/display_finder.cc

 // Copyright 2016 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 "ui/display/display_finder.h"
 
+#include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
 #include "ui/display/display.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace display {
 
 const Display* FindDisplayNearestPoint(const std::vector<Display>& displays,
                                        const gfx::Point& point) {
   DCHECK(!displays.empty());
+  const int containing_index = FindDisplayIndexContainingPoint(displays, point);
+  if (containing_index != -1)
+    return &displays[containing_index];
+
   int min_distance = std::numeric_limits<int>::max();
   const Display* nearest_display = nullptr;
   for (const auto& display : displays) {
     const int distance = display.bounds().ManhattanDistanceToPoint(point);
     if (distance < min_distance) {
       min_distance = distance;
       nearest_display = &display;
     }
   }
   // There should always be at least one display that is less than INT_MAX away.
@@ skipping 11 matching lines @@
     const gfx::Rect intersect = IntersectRects(display.bounds(), rect);
     const int area = intersect.width() * intersect.height();
     if (area > max_area) {
       max_area = area;
       matching = &display;
     }
   }
   return matching;
 }
 
+int FindDisplayIndexContainingPoint(const std::vector<Display>& displays,
+                                    const gfx::Point& point_in_screen) {
+  auto iter = std::find_if(displays.begin(), displays.end(),
+                           [point_in_screen](const Display& display) {
+                             return display.bounds().Contains(point_in_screen);
+                           });
+  return iter == displays.end() ? -1 : (iter - displays.begin());
+}
+
 }  // namespace display