Rename gfx::Screen/DIsplay to display::Screen/Display in ui/views_content_client

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 152 matching lines @@
 namespace {
 
 using aura::Window;
 using views::Widget;
 
 // Returns the display id corresponding to window, or |GetTargetDisplayId()|
 // if |window| is null.
 int64_t GetDisplayIdForWindow(aura::Window* window) {
   if (!window)
     return Shell::GetTargetDisplayId();
-  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).id();
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(window).id();
 }
 
 // A Corewm VisibilityController subclass that calls the Ash animation routine
 // so we can pick up our extended animations. See ash/wm/window_animations.h.
 class AshVisibilityController : public ::wm::VisibilityController {
  public:
   AshVisibilityController() {}
   ~AshVisibilityController() override {}
 
  private:
@@ skipping 73 matching lines @@
 aura::Window* Shell::GetTargetRootWindow() {
   CHECK(HasInstance());
   Shell* shell = GetInstance();
   if (shell->scoped_target_root_window_)
     return shell->scoped_target_root_window_;
   return shell->target_root_window_;
 }
 
 // static
 int64_t Shell::GetTargetDisplayId() {
-  return gfx::Screen::GetScreen()
+  return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(GetTargetRootWindow())
       .id();
 }
 
 // static
 aura::Window::Windows Shell::GetAllRootWindows() {
   CHECK(HasInstance());
   return Shell::GetInstance()->window_tree_host_manager()->GetAllRootWindows();
 }
 
@@ skipping 983 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash