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

ash/wm/aura/wm_window_aura.h

Index: ash/wm/aura/wm_window_aura.h
diff --git a/ash/wm/aura/wm_window_aura.h b/ash/wm/aura/wm_window_aura.h
index 04589b69ae83017d082fa6649ada2f06d027b411..fd360ff569d1457bd13a9c31158141b0cbc59f81 100644
--- a/ash/wm/aura/wm_window_aura.h
+++ b/ash/wm/aura/wm_window_aura.h
@@ -47,7 +47,7 @@ class ASH_EXPORT WmWindowAura : public WmWindow, public aura::WindowObserver {
   WmWindow* GetChildByShellWindowId(int id) override;
   ui::wm::WindowType GetType() const override;
   ui::Layer* GetLayer() override;
-  gfx::Display GetDisplayNearestWindow() override;
+  display::Display GetDisplayNearestWindow() override;
   bool HasNonClientArea() override;
   int GetNonClientComponent(const gfx::Point& location) override;
   gfx::Point ConvertPointToTarget(const WmWindow* target,
@@ -83,7 +83,7 @@ class ASH_EXPORT WmWindowAura : public WmWindow, public aura::WindowObserver {
   void SetBoundsDirectAnimated(const gfx::Rect& bounds) override;
   void SetBoundsDirectCrossFade(const gfx::Rect& bounds) override;
   void SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
-                         const gfx::Display& dst_display) override;
+                         const display::Display& dst_display) override;
   gfx::Rect GetBoundsInScreen() const override;
   const gfx::Rect& GetBounds() const override;
   gfx::Rect GetTargetBounds() override;