Rename gfx::Display/Screen to display::Display/Screen in views/wm

ui/views/mus/screen_mus.h

Index: ui/views/mus/screen_mus.h
diff --git a/ui/views/mus/screen_mus.h b/ui/views/mus/screen_mus.h
index 4441b4f98243a58863c7cd57549c0ae5ca21d684..dd13f4b85274d512361679514b9cd002ddb8d1d4 100644
--- a/ui/views/mus/screen_mus.h
+++ b/ui/views/mus/screen_mus.h
@@ -11,8 +11,8 @@
 #include "base/run_loop.h"
 #include "components/mus/public/interfaces/display.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/views/mus/mus_export.h"
 
 namespace shell {
@@ -25,7 +25,7 @@ class ScreenMusDelegate;
 
 // Screen implementation backed by mus::mojom::DisplayManager.
 class VIEWS_MUS_EXPORT ScreenMus
-    : public gfx::Screen,
+    : public display::Screen,
       public NON_EXPORTED_BASE(mus::mojom::DisplayManagerObserver) {
  public:
   // |delegate| can be nullptr.
@@ -39,21 +39,23 @@ class VIEWS_MUS_EXPORT ScreenMus
 
   // Invoked when a display changed in some weay, including being added.
   // If |is_primary| is true, |changed_display| is the primary display.
-  void ProcessDisplayChanged(const gfx::Display& changed_display,
+  void ProcessDisplayChanged(const display::Display& changed_display,
                              bool is_primary);
 
-  // gfx::Screen:
+  // display::Screen:
   gfx::Point GetCursorScreenPoint() override;
   gfx::NativeWindow GetWindowUnderCursor() override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
-  gfx::Display GetPrimaryDisplay() const override;
-  gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
-  gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
+  display::Display GetPrimaryDisplay() const override;
+  display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
+  display::Display GetDisplayNearestPoint(
+      const gfx::Point& point) const override;
   int GetNumDisplays() const override;
-  std::vector<gfx::Display> GetAllDisplays() const override;
-  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
-  void AddObserver(gfx::DisplayObserver* observer) override;
-  void RemoveObserver(gfx::DisplayObserver* observer) override;
+  std::vector<display::Display> GetAllDisplays() const override;
+  display::Display GetDisplayMatching(
+      const gfx::Rect& match_rect) const override;
+  void AddObserver(display::DisplayObserver* observer) override;
+  void RemoveObserver(display::DisplayObserver* observer) override;
 
   // mus::mojom::DisplayManager:
   void OnDisplays(mojo::Array<mus::mojom::DisplayPtr> displays) override;
@@ -62,11 +64,11 @@ class VIEWS_MUS_EXPORT ScreenMus
 
   ScreenMusDelegate* delegate_;  // Can be nullptr.
   mus::mojom::DisplayManagerPtr display_manager_;
-  std::vector<gfx::Display> displays_;
+  std::vector<display::Display> displays_;
   int primary_display_index_;
   mojo::Binding<mus::mojom::DisplayManagerObserver>
       display_manager_observer_binding_;
-  base::ObserverList<gfx::DisplayObserver> observers_;
+  base::ObserverList<display::DisplayObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenMus);
 };