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

ash/display/screen_orientation_controller_chromeos.h

Index: ash/display/screen_orientation_controller_chromeos.h
diff --git a/ash/display/screen_orientation_controller_chromeos.h b/ash/display/screen_orientation_controller_chromeos.h
index 1157425a63a8fd6b4c1340ae43da35d987378120..76be6fd03327daa6614b1da67f30ac84e679188e 100644
--- a/ash/display/screen_orientation_controller_chromeos.h
+++ b/ash/display/screen_orientation_controller_chromeos.h
@@ -16,7 +16,7 @@
 #include "chromeos/accelerometer/accelerometer_types.h"
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
 #include "ui/aura/window_observer.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
@@ -74,8 +74,8 @@ class ASH_EXPORT ScreenOrientationController
   // Sets the display rotation for the given |source|. The new |rotation| will
   // also become active. Display changed notifications are surpressed for this
   // change.
-  void SetDisplayRotation(gfx::Display::Rotation rotation,
-                          gfx::Display::RotationSource source);
+  void SetDisplayRotation(display::Display::Rotation rotation,
+                          display::Display::RotationSource source);
 
   // aura::client::ActivationChangeObserver:
   void OnWindowActivated(
@@ -102,8 +102,8 @@ class ASH_EXPORT ScreenOrientationController
   // Sets the display rotation to |rotation|. Future accelerometer updates
   // should not be used to change the rotation. SetRotationLocked(false) removes
   // the rotation lock.
-  void LockRotation(gfx::Display::Rotation rotation,
-                    gfx::Display::RotationSource source);
+  void LockRotation(display::Display::Rotation rotation,
+                    display::Display::RotationSource source);
 
   // Sets the display rotation based on |lock_orientation|. Future accelerometer
   // updates should not be used to change the rotation. SetRotationLocked(false)
@@ -144,7 +144,7 @@ class ASH_EXPORT ScreenOrientationController
   // two angles of the same screen orientation
   // (http://www.w3.org/TR/screen-orientation/). Returns true if |rotation| is
   // supported for the current |rotation_locked_orientation_|.
-  bool IsRotationAllowedInLockedState(gfx::Display::Rotation rotation);
+  bool IsRotationAllowedInLockedState(display::Display::Rotation rotation);
 
   // Certain orientation locks allow for rotation between the two angles of the
   // same screen orientation. Returns true if |rotation_locked_orientation_|
@@ -166,11 +166,11 @@ class ASH_EXPORT ScreenOrientationController
 
   // The rotation of the display set by the user. This rotation will be
   // restored upon exiting maximize mode.
-  gfx::Display::Rotation user_rotation_;
+  display::Display::Rotation user_rotation_;
 
   // The current rotation set by ScreenOrientationController for the internal
   // display.
-  gfx::Display::Rotation current_rotation_;
+  display::Display::Rotation current_rotation_;
 
   // Rotation Lock observers.
   base::ObserverList<Observer> observers_;