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

ash/mus/sysui_application.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 "ash/mus/sysui_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 181 matching lines @@
   ~AshInit() { worker_pool_->Shutdown(); }
 
   aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
 
   void Initialize(::shell::Connector* connector,
                   const ::shell::Identity& identity) {
     InitializeResourceBundle(connector);
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
     views::WindowManagerConnection::Create(connector, identity);
 
-    gfx::Screen* screen = gfx::Screen::GetScreen();
+    display::Screen* screen = display::Screen::GetScreen();
     DCHECK(screen);
     gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
 
     // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
     // installs and uses the ScreenAsh. This can be removed once ash learns to
     // talk to mus for managing displays.
-    gfx::Screen::SetScreenInstance(nullptr);
+    display::Screen::SetScreenInstance(nullptr);
 
     // Install some hook so that the WindowTreeHostMus created for widgets can
     // be hooked up correctly.
     native_widget_factory_.reset(new NativeWidgetFactory());
 
     ash::AshWindowTreeHost::SetFactory(base::Bind(&CreateWindowTreeHostMus));
     ash_delegate_ = new ShellDelegateMus;
 
     InitializeComponents();
 
@@ skipping 98 matching lines @@
 void SysUIApplication::Create(
     ::shell::Connection* connection,
     mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash