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

chrome/browser/ui/app_list/arc/arc_app_utils.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 "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "components/arc/arc_bridge_service.h"
 #include "ui/aura/window.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace arc {
 
 namespace {
 
 // A class which handles the asynchronous ARC runtime callback to figure out if
 // an app can handle a certain resolution or not.
 // After LaunchAndRelease() got called, the object will destroy itself once
 // done.
 class LaunchAppWithoutSize {
@@ skipping 50 matching lines @@
   // Find a proper size and position for a given rectangle on the screen.
   // TODO(skuhne): This needs more consideration, but it is lacking
   // WindowPositioner functionality since we do not have an Aura::Window yet.
   gfx::Rect getTargetRect(const gfx::Size& size) {
     // Make sure that the window will fit into our workspace.
     // Note that Arc++ will always be on the primary screen (for now).
     // Note that Android's coordinate system is only valid inside the working
     // area. We can therefore ignore the provided left / top offsets.
     aura::Window* root = ash::Shell::GetPrimaryRootWindow();
     gfx::Rect work_area =
-        gfx::Screen::GetScreen()->GetDisplayNearestWindow(root).work_area();
+        display::Screen::GetScreen()->GetDisplayNearestWindow(root).work_area();
 
     // For what Android is concerned, the title bar starts at -TITLE_BAR_HEIGHT.
     // as such we deduct the title bar height simply from the height, but leave
     // the top as it is.
     work_area.set_height(work_area.height() - WINDOW_TITLE_HEIGHT);
     gfx::Rect result(size);
 
     // Make sure that the window fits entirely into the work area.
     if (size.width() < work_area.width() ||
         size.height() < work_area.height()) {
@@ skipping 141 matching lines @@
 
   if (bridge_service->app_version() < 2) {
     LOG(ERROR) << "Request to uninstall package when version "
                << bridge_service->app_version() << " does not support it";
     return;
   }
   app_instance->UninstallPackage(package_name);
 }
 
 }  // namespace arc