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

ash/wm/common/default_state.h

 // Copyright 2014 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.
 
 #ifndef ASH_WM_COMMON_DEFAULT_STATE_H_
 #define ASH_WM_COMMON_DEFAULT_STATE_H_
 
 #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 {
 namespace wm {
 class SetBoundsEvent;
 
 // DefaultState implements Ash behavior without state machine.
 class DefaultState : public WindowState::State {
  public:
   explicit DefaultState(WindowStateType initial_state_type);
@@ skipping 40 matching lines @@
                              wm::WindowStateType old_state_type);
 
   // The current type of the window.
   WindowStateType state_type_;
 
   // The saved window state for the case that the state gets de-/activated.
   gfx::Rect stored_bounds_;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultState);
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_DEFAULT_STATE_H_