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

extensions/shell/browser/shell_screen.h

Index: extensions/shell/browser/shell_screen.h
diff --git a/extensions/shell/browser/shell_screen.h b/extensions/shell/browser/shell_screen.h
index 4d24891785c7743f9e3de1c1bca8cde33a1346a4..412fa568e23903ad9c5974d842c182d58e9824bf 100644
--- a/extensions/shell/browser/shell_screen.h
+++ b/extensions/shell/browser/shell_screen.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "ui/aura/window_observer.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;
@@ -22,7 +22,7 @@ namespace extensions {
 
 // A minimal Aura implementation of a screen. Scale factor is locked at 1.0.
 // When running on a Linux desktop resizing the main window resizes the screen.
-class ShellScreen : public gfx::Screen, public aura::WindowObserver {
+class ShellScreen : public display::Screen, public aura::WindowObserver {
  public:
   // Creates a screen occupying |size| physical pixels.
   explicit ShellScreen(const gfx::Size& size);
@@ -37,22 +37,24 @@ class ShellScreen : public gfx::Screen, public aura::WindowObserver {
                              const gfx::Rect& new_bounds) override;
   void OnWindowDestroying(aura::Window* window) 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:
   aura::WindowTreeHost* host_;  // Not owned.
-  gfx::Display display_;
+  display::Display display_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellScreen);
 };