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

ash/display/extended_mouse_warp_controller.h

 // 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.
 
 #ifndef ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 #define ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 
 #include "ash/display/mouse_warp_controller.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Point;
 class Display;
 }
 
+namespace display {
+using Display = gfx::Display;
+}
+
 namespace ash {
 namespace test {
 class DisplayManagerTestApi;
 }
 class SharedDisplayEdgeIndicator;
 
 // A MouseWarpController used in extended display mode.
 class ASH_EXPORT ExtendedMouseWarpController : public MouseWarpController {
  public:
   explicit ExtendedMouseWarpController(aura::Window* drag_source);
@@ skipping 66 matching lines @@
   // Returns true if/ the cursor was moved.
   bool WarpMouseCursorInNativeCoords(const gfx::Point& point_in_native,
                                      const gfx::Point& point_in_screen,
                                      bool update_mouse_location_now);
 
   // Creates WarpRegion between display |a| and |b|.
   // |drag_source_dispaly_id| is used to indicate in which display a
   // drag is started, or invalid id passed if this is not for
   // dragging. Returns null scoped_ptr if two displays do not share
   // the edge.
-  std::unique_ptr<WarpRegion> CreateWarpRegion(const gfx::Display& a,
-                                               const gfx::Display& b,
+  std::unique_ptr<WarpRegion> CreateWarpRegion(const display::Display& a,
+                                               const display::Display& b,
                                                int64_t drag_source_dispay_id);
 
   void allow_non_native_event_for_test() { allow_non_native_event_ = true; }
 
   // The root window in which the dragging started.
   aura::Window* drag_source_root_;
 
   bool enabled_;
 
   bool allow_non_native_event_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H