Rename gfx::Display/Screen to display::Display/Screen in ash

ash/wm/common/root_window_finder.cc

Index: ash/wm/common/root_window_finder.cc
diff --git a/ash/wm/common/root_window_finder.cc b/ash/wm/common/root_window_finder.cc
index 3f3aefd0307105dfe41032a2df4971c408c01340..9be6c9052f62664628ca8f1a320335c93344e2cd 100644
--- a/ash/wm/common/root_window_finder.cc
+++ b/ash/wm/common/root_window_finder.cc
@@ -6,17 +6,17 @@
 
 #include "ash/wm/common/wm_root_window_controller.h"
 #include "ash/wm/common/wm_window.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 
 namespace ash {
 namespace wm {
 
 WmWindow* GetRootWindowAt(const gfx::Point& point) {
-  const gfx::Display& display =
-      gfx::Screen::GetScreen()->GetDisplayNearestPoint(point);
+  const display::Display& display =
+      display::Screen::GetScreen()->GetDisplayNearestPoint(point);
   DCHECK(display.is_valid());
   WmRootWindowController* root_window_controller =
       WmRootWindowController::GetWithDisplayId(display.id());
@@ -24,8 +24,8 @@ WmWindow* GetRootWindowAt(const gfx::Point& point) {
 }
 
 WmWindow* GetRootWindowMatching(const gfx::Rect& rect) {
-  const gfx::Display& display =
-      gfx::Screen::GetScreen()->GetDisplayMatching(rect);
+  const display::Display& display =
+      display::Screen::GetScreen()->GetDisplayMatching(rect);
   WmRootWindowController* root_window_controller =
       WmRootWindowController::GetWithDisplayId(display.id());
   return root_window_controller ? root_window_controller->GetWindow() : nullptr;