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

ash/root_window_settings.cc

Index: ash/root_window_settings.cc
diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
index ed4931f88f1e4e5199d9b33ab17e00bf78d3e413..bf7841f983e318d329a20f10dfaed22e60795041 100644
--- a/ash/root_window_settings.cc
+++ b/ash/root_window_settings.cc
@@ -6,7 +6,7 @@
 
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*);
 
@@ -16,9 +16,7 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings,
                                  kRootWindowSettingsKey, NULL);
 
 RootWindowSettings::RootWindowSettings()
-    : display_id(gfx::Display::kInvalidDisplayID),
-      controller(NULL) {
-}
+    : display_id(display::Display::kInvalidDisplayID), controller(NULL) {}
 
 RootWindowSettings* InitRootWindowSettings(aura::Window* root) {
   RootWindowSettings* settings = new RootWindowSettings();