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

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 974fee27390f096df4d70c3f0aa59334db71cd92..8f4b51a1e00456341a85ffa62f2252a5dd4ceccd 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -170,7 +170,7 @@ using views::Widget;
 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
@@ -264,7 +264,7 @@ aura::Window* Shell::GetTargetRootWindow() {
 
 // static
 int64_t Shell::GetTargetDisplayId() {
-  return gfx::Screen::GetScreen()
+  return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(GetTargetRootWindow())
       .id();
 }