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

ash/display/screen_ash.h

Index: ash/display/screen_ash.h
diff --git a/ash/display/screen_ash.h b/ash/display/screen_ash.h
index 991f72f01f5dea8b8cb66148b577e9bffc9759e3..fe951b8f2fa6f74b8fc154c4fffc058bcea9b542 100644
--- a/ash/display/screen_ash.h
+++ b/ash/display/screen_ash.h
@@ -11,8 +11,8 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "ui/gfx/display_observer.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display_observer.h"
+#include "ui/display/screen.h"
 
 namespace gfx {
 class Rect;
@@ -23,39 +23,41 @@ namespace  internal {
 class DisplayManager;
 }
 
-// Aura implementation of gfx::Screen. Implemented here to avoid circular
+// Aura implementation of display::Screen. Implemented here to avoid circular
 // dependencies.
-class ASH_EXPORT ScreenAsh : public gfx::Screen {
+class ASH_EXPORT ScreenAsh : public display::Screen {
  public:
   ScreenAsh();
   ~ScreenAsh() override;
 
-  // gfx::Screen overrides:
+  // display::Screen overrides:
   gfx::Point GetCursorScreenPoint() override;
   gfx::NativeWindow GetWindowUnderCursor() override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
   int GetNumDisplays() const override;
-  std::vector<gfx::Display> GetAllDisplays() const override;
-  gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
-  gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
-  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
-  gfx::Display GetPrimaryDisplay() const override;
-  void AddObserver(gfx::DisplayObserver* observer) override;
-  void RemoveObserver(gfx::DisplayObserver* observer) override;
+  std::vector<display::Display> GetAllDisplays() const override;
+  display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
+  display::Display GetDisplayNearestPoint(
+      const gfx::Point& point) const override;
+  display::Display GetDisplayMatching(
+      const gfx::Rect& match_rect) const override;
+  display::Display GetPrimaryDisplay() const override;
+  void AddObserver(display::DisplayObserver* observer) override;
+  void RemoveObserver(display::DisplayObserver* observer) override;
 
  private:
   friend class DisplayManager;
 
   // Notifies observers of display configuration changes.
-  void NotifyMetricsChanged(const gfx::Display& display, uint32_t metrics);
-  void NotifyDisplayAdded(const gfx::Display& display);
-  void NotifyDisplayRemoved(const gfx::Display& display);
+  void NotifyMetricsChanged(const display::Display& display, uint32_t metrics);
+  void NotifyDisplayAdded(const display::Display& display);
+  void NotifyDisplayRemoved(const display::Display& display);
 
   // Creates a screen that can be used during shutdown.
   // It simply has a copy of the displays.
-  gfx::Screen* CloneForShutdown();
+  display::Screen* CloneForShutdown();
 
-  base::ObserverList<gfx::DisplayObserver> observers_;
+  base::ObserverList<display::DisplayObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
 };