Rename gfx::Display to display::Display

mash/wm/root_window_controller.h

Index: mash/wm/root_window_controller.h
diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
index dbccd55b52d5ed302e89f13131812905f12ea890..59ba85dcdbf2e409217388686330c4451cd6bb68 100644
--- a/mash/wm/root_window_controller.h
+++ b/mash/wm/root_window_controller.h
@@ -13,7 +13,7 @@
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace mus {
 class WindowManagerClient;
@@ -68,7 +68,7 @@ class RootWindowController : public mus::WindowObserver,
 
   void OnAccelerator(uint32_t id, const ui::Event& event);
 
-  const gfx::Display& display() const { return display_; }
+  const display::Display& display() const { return display_; }
 
   ShelfLayoutManager* GetShelfLayoutManager();
   StatusLayoutManager* GetStatusLayoutManager();
@@ -102,7 +102,7 @@ class RootWindowController : public mus::WindowObserver,
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
-  gfx::Display display_;
+  display::Display display_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };