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

ash/root_window_settings.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_settings.h"
 
 #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*);
 
 namespace ash {
 
 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();
   root->SetProperty(kRootWindowSettingsKey, settings);
   return settings;
 }
 
 RootWindowSettings* GetRootWindowSettings(aura::Window* root) {
   return root->GetProperty(kRootWindowSettingsKey);
 }
 
 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) {
   return root->GetProperty(kRootWindowSettingsKey);
 }
 
 }  // namespace ash