Move display_finder to ui/display

ui/views/mus/screen_mus.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/views/mus/screen_mus.h"
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/aura/window.h"
+#include "ui/display/display_finder.h"
 #include "ui/display/display_observer.h"
-#include "ui/gfx/display_finder.h"
 #include "ui/views/mus/screen_mus_delegate.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 
 namespace mojo {
 
 template <>
 struct TypeConverter<display::Display, mus::mojom::DisplayPtr> {
   static display::Display Convert(const mus::mojom::DisplayPtr& input) {
     display::Display result(input->id);
     gfx::Rect pixel_bounds = input->bounds.To<gfx::Rect>();
@@ skipping 169 matching lines @@
 }
 
 display::Display ScreenMus::GetDisplayNearestWindow(
     gfx::NativeView view) const {
   //NOTIMPLEMENTED();
   return GetPrimaryDisplay();
 }
 
 display::Display ScreenMus::GetDisplayNearestPoint(
     const gfx::Point& point) const {
-  return *gfx::FindDisplayNearestPoint(displays_, point);
+  return *display::FindDisplayNearestPoint(displays_, point);
 }
 
 int ScreenMus::GetNumDisplays() const {
   return static_cast<int>(displays_.size());
 }
 
 std::vector<display::Display> ScreenMus::GetAllDisplays() const {
   return displays_;
 }
 
 display::Display ScreenMus::GetDisplayMatching(
     const gfx::Rect& match_rect) const {
   const display::Display* match =
-      gfx::FindDisplayWithBiggestIntersection(displays_, match_rect);
+      display::FindDisplayWithBiggestIntersection(displays_, match_rect);
   return match ? *match : GetPrimaryDisplay();
 }
 
 void ScreenMus::AddObserver(display::DisplayObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ScreenMus::RemoveObserver(display::DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
@@ skipping 37 matching lines @@
   DCHECK_NE(-1, index);
   // Another display must become primary before the existing primary is
   // removed.
   DCHECK_NE(index, primary_display_index_);
   const display::Display display = displays_[index];
   FOR_EACH_OBSERVER(display::DisplayObserver, observers_,
                     OnDisplayRemoved(display));
 }
 
 }  // namespace views