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

ash/wm/window_positioner.cc

Index: ash/wm/window_positioner.cc
diff --git a/ash/wm/window_positioner.cc b/ash/wm/window_positioner.cc
index 499fbf70a78ab04f880945b5741dc4d17408a568..dd3de0ac851333a5ef675fdbe22e66233ac973a7 100644
--- a/ash/wm/window_positioner.cc
+++ b/ash/wm/window_positioner.cc
@@ -10,8 +10,8 @@
 #include "ash/wm/common/wm_screen_util.h"
 #include "ash/wm/common/wm_window.h"
 #include "ui/compositor/layer.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
-#include "ui/gfx/screen.h"
 
 namespace ash {
 
@@ -386,7 +386,7 @@ WindowPositioner::~WindowPositioner() {
 }
 
 gfx::Rect WindowPositioner::GetDefaultWindowBounds(
-    const gfx::Display& display) {
+    const display::Display& display) {
   const gfx::Rect work_area = display.work_area();
   // There should be a 'desktop' border around the window at the left and right
   // side.
@@ -424,7 +424,7 @@ gfx::Rect WindowPositioner::GetPopupPosition(const gfx::Rect& old_pos) {
   const gfx::Rect work_area =
       window && window->IsVisible()
           ? window->GetDisplayNearestWindow().work_area()
-          : gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
+          : display::Screen::GetScreen()->GetPrimaryDisplay().work_area();
   // Only try to reposition the popup when it is not spanning the entire
   // screen.
   if ((old_pos.width() + popup_position_offset_from_screen_corner_x >=