Rename gfx::Display to display::Display

mash/wm/root_window_controller.cc

 // 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.
 
 #include "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/event_matcher_util.h"
@@ skipping 29 matching lines @@
 }
 
 }  // namespace
 
 // static
 RootWindowController* RootWindowController::CreateFromDisplay(
     WindowManagerApplication* app,
     mus::mojom::DisplayPtr display,
     mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
   RootWindowController* controller = new RootWindowController(app);
-  controller->display_ = display.To<gfx::Display>();
+  controller->display_ = display.To<display::Display>();
   mus::WindowTreeConnection::CreateForWindowManager(
       controller, std::move(client_request),
       mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED,
       controller->window_manager_.get());
   return controller;
 }
 
 void RootWindowController::Destroy() {
   // See class description for details on lifetime.
   if (root_) {
@@ skipping 157 matching lines @@
   CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT);
   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT);
 }
 
 }  // namespace wm
 }  // namespace mash