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

ash/display/event_transformation_handler.cc

Index: ash/display/event_transformation_handler.cc
diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc
index 484a20a98b175c2673a2750d98af12d4f10044c6..f6e5a63fba2c4b70c438df2b0d9eed7248dbf06b 100644
--- a/ash/display/event_transformation_handler.cc
+++ b/ash/display/event_transformation_handler.cc
@@ -12,9 +12,9 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/dip_util.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/events/event.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
@@ -41,8 +41,8 @@ void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {
   gfx::Point point_in_screen(event->location());
   aura::Window* target = static_cast<aura::Window*>(event->target());
   ::wm::ConvertPointToScreen(target, &point_in_screen);
-  const gfx::Display& display =
-      gfx::Screen::GetScreen()->GetDisplayNearestPoint(point_in_screen);
+  const display::Display& display =
+      display::Screen::GetScreen()->GetDisplayNearestPoint(point_in_screen);
 
   // Apply some additional scaling if the display is non-integrated.
   if (!display.IsInternal())