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

ash/wm/aura/wm_window_aura.cc

Index: ash/wm/aura/wm_window_aura.cc
diff --git a/ash/wm/aura/wm_window_aura.cc b/ash/wm/aura/wm_window_aura.cc
index 9f112025710bbe103464af76e8f978d733a15af9..22b6bd5c1bbe6c4b008b2332521f7ae7d6db294a 100644
--- a/ash/wm/aura/wm_window_aura.cc
+++ b/ash/wm/aura/wm_window_aura.cc
@@ -26,7 +26,7 @@
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/window_util.h"
 
@@ -136,8 +136,8 @@ ui::Layer* WmWindowAura::GetLayer() {
   return window_->layer();
 }
 
-gfx::Display WmWindowAura::GetDisplayNearestWindow() {
-  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window_);
+display::Display WmWindowAura::GetDisplayNearestWindow() {
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(window_);
 }
 
 bool WmWindowAura::HasNonClientArea() {
@@ -334,7 +334,7 @@ void WmWindowAura::SetBoundsDirectCrossFade(const gfx::Rect& bounds) {
 }
 
 void WmWindowAura::SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
-                                     const gfx::Display& dst_display) {
+                                     const display::Display& dst_display) {
   window_->SetBoundsInScreen(bounds_in_screen, dst_display);
 }