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

ash/wm/common/default_state.h

Index: ash/wm/common/default_state.h
diff --git a/ash/wm/common/default_state.h b/ash/wm/common/default_state.h
index 8e5be0139010752ad3eb2232b22f2ad615aadd3a..ca35b213376e4630d693835fcc1f4e4f44c4e66e 100644
--- a/ash/wm/common/default_state.h
+++ b/ash/wm/common/default_state.h
@@ -7,7 +7,7 @@
 
 #include "ash/wm/common/window_state.h"
 #include "base/macros.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
@@ -68,7 +68,7 @@ class DefaultState : public WindowState::State {
   gfx::Rect stored_restore_bounds_;
 
   // The display state in which the mode got started.
-  gfx::Display stored_display_state_;
+  display::Display stored_display_state_;
 
   // The window state only gets remembered for DCHECK reasons.
   WindowState* stored_window_state_;