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

ash/display/extended_mouse_warp_controller.cc

 // Copyright 2015 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/display/extended_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/shared_display_edge_indicator.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/screen.h"
 #include "ui/events/event_utils.h"
-#include "ui/gfx/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
 // Maximum size on the display edge that initiate snapping phantom window,
 // from the corner of the display.
 const int kMaximumSnapHeight = 16;
 
 // Minimum height of an indicator on the display edge that allows
 // dragging a window.  If two displays shares the edge smaller than
 // this, entire edge will be used as a draggable space.
 const int kMinimumIndicatorHeight = 200;
 
-// Helper method that maps a gfx::Display to an aura::Window.
+// Helper method that maps a display::Display to an aura::Window.
 aura::Window* GetRootWindowForDisplayId(int64_t display_id) {
   return Shell::GetInstance()
       ->window_tree_host_manager()
       ->GetRootWindowForDisplayId(display_id);
 }
 
 // Helper method that maps an aura::Window to display id;
 int64_t GetDisplayIdFromWindow(aura::Window* window) {
-  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).id();
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(window).id();
 }
 
 // Adjust the edge so that it has |barrier_size| gap at the top to
 // trigger snap window action.
 void AdjustSourceEdgeBounds(const gfx::Rect& display_bounds,
                             int barrier_size,
                             gfx::Rect* edge) {
   DCHECK_GT(edge->height(), edge->width());
   int target_y = display_bounds.y() + barrier_size;
   if (target_y < edge->y())
@@ skipping 41 matching lines @@
   return b_indicator_bounds_;
 }
 
 ExtendedMouseWarpController::ExtendedMouseWarpController(
     aura::Window* drag_source)
     : drag_source_root_(drag_source),
       allow_non_native_event_(false) {
   ash::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   int64_t drag_source_id = drag_source ? GetDisplayIdFromWindow(drag_source)
-                                       : gfx::Display::kInvalidDisplayID;
+                                       : display::Display::kInvalidDisplayID;
   display::DisplayList display_list = display_manager->active_display_list();
   // Try to create a Warp region for all possible two displays combination.
   // The following code does it by poping the last element in the list
   // and then pairing with remaining displays in the list, until the list
   // becomes single element.
   while (display_list.size() > 1) {
-    gfx::Display display = display_list.back();
+    display::Display display = display_list.back();
     display_list.pop_back();
-    for (const gfx::Display& peer : display_list) {
+    for (const display::Display& peer : display_list) {
       std::unique_ptr<WarpRegion> region =
           CreateWarpRegion(display, peer, drag_source_id);
       if (region)
         AddWarpRegion(std::move(region), drag_source != nullptr);
     }
   }
 }
 
 ExtendedMouseWarpController::~ExtendedMouseWarpController() {
 }
 
 bool ExtendedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) {
-  if (gfx::Screen::GetScreen()->GetNumDisplays() <= 1 || !enabled_)
+  if (display::Screen::GetScreen()->GetNumDisplays() <= 1 || !enabled_)
     return false;
 
   aura::Window* target = static_cast<aura::Window*>(event->target());
   gfx::Point point_in_screen = event->location();
   ::wm::ConvertPointToScreen(target, &point_in_screen);
 
   // A native event may not exist in unit test. Generate the native point
   // from the screen point instead.
   if (!event->HasNativeEvent()) {
     if (!allow_non_native_event_)
@@ skipping 55 matching lines @@
         GetRootWindowController(dst_window)->ash_host();
 
     MoveCursorTo(target_ash_host, point_in_screen, update_mouse_location_now);
     return true;
   }
 
   return false;
 }
 
 std::unique_ptr<ExtendedMouseWarpController::WarpRegion>
-ExtendedMouseWarpController::CreateWarpRegion(const gfx::Display& a,
-                                              const gfx::Display& b,
+ExtendedMouseWarpController::CreateWarpRegion(const display::Display& a,
+                                              const display::Display& b,
                                               int64_t drag_source_id) {
   gfx::Rect a_edge;
   gfx::Rect b_edge;
-  int snap_barrier = drag_source_id == gfx::Display::kInvalidDisplayID
+  int snap_barrier = drag_source_id == display::Display::kInvalidDisplayID
                          ? 0
                          : kMaximumSnapHeight;
 
   if (!ComputeBoundary(a, b, &a_edge, &b_edge))
     return nullptr;
 
   // Creates the snap window barrirer only when horizontally connected.
   if (a_edge.height() > a_edge.width()) {
     if (drag_source_id == a.id())
       AdjustSourceEdgeBounds(a.bounds(), snap_barrier, &a_edge);
     else if (drag_source_id == b.id())
       AdjustSourceEdgeBounds(b.bounds(), snap_barrier, &b_edge);
   }
 
   return base::WrapUnique(new WarpRegion(a.id(), b.id(), a_edge, b_edge));
 }
 
 }  // namespace ash