Rename gfx::Display to display::Display

mash/wm/root_window_controller.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 
 #include <memory>
 
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #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;
 }
 
 namespace shell {
 class Connector;
 }
 
 namespace ui {
@@ skipping 34 matching lines @@
 
   mus::Window* GetWindowForContainer(mojom::Container container);
   bool WindowIsContainer(const mus::Window* window) const;
 
   WindowManager* window_manager() { return window_manager_.get(); }
 
   mus::WindowManagerClient* window_manager_client();
 
   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();
 
  private:
   explicit RootWindowController(WindowManagerApplication* app);
   ~RootWindowController() override;
 
   void AddAccelerators();
 
@@ skipping 13 matching lines @@
   WindowManagerApplication* app_;
   mus::Window* root_;
   int window_count_;
 
   std::unique_ptr<WindowManager> window_manager_;
 
   std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_manager_;
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
-  gfx::Display display_;
+  display::Display display_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_ROOT_WINDOW_CONTROLLER_H_