Rename gfx::Display/Screen to display::Display/Screen in chromecast/blimp/media

blimp/engine/app/ui/blimp_screen.h

Index: blimp/engine/app/ui/blimp_screen.h
diff --git a/blimp/engine/app/ui/blimp_screen.h b/blimp/engine/app/ui/blimp_screen.h
index 991a0281d30dfc739760010868b319f20f9b8327..adf884b9d8f14c55dfaeabd5e71e82795856d31b 100644
--- a/blimp/engine/app/ui/blimp_screen.h
+++ b/blimp/engine/app/ui/blimp_screen.h
@@ -9,8 +9,8 @@
 
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace aura {
 class WindowTreeHost;
@@ -20,7 +20,7 @@ namespace blimp {
 namespace engine {
 
 // Presents the client's single screen.
-class BlimpScreen : public gfx::Screen {
+class BlimpScreen : public display::Screen {
  public:
   BlimpScreen();
   ~BlimpScreen() override;
@@ -32,23 +32,25 @@ class BlimpScreen : public gfx::Screen {
   // Updates the size reported by the primary display.
   void UpdateDisplayScaleAndSize(float scale, const gfx::Size& size);
 
-  // gfx::Screen implementation.
+  // display::Screen implementation.
   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:
   aura::WindowTreeHost* window_tree_host_;
-  gfx::Display display_;
-  base::ObserverList<gfx::DisplayObserver> observers_;
+  display::Display display_;
+  base::ObserverList<display::DisplayObserver> observers_;
   DISALLOW_COPY_AND_ASSIGN(BlimpScreen);
 };