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

ash/wm/ash_native_cursor_manager.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/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
 
 void AshNativeCursorManager::SetNativeCursorEnabled(bool enabled) {
   native_cursor_enabled_ = enabled;
 
   ::wm::CursorManager* cursor_manager =
       Shell::GetInstance()->cursor_manager();
   SetCursor(cursor_manager->GetCursor(), cursor_manager);
 }
 
 void AshNativeCursorManager::SetDisplay(
-    const gfx::Display& display,
+    const display::Display& display,
     ::wm::NativeCursorManagerDelegate* delegate) {
   DCHECK(display.is_valid());
   // Use the platform's device scale factor instead of the display's, which
   // might have been adjusted for the UI scale.
   const float original_scale = Shell::GetInstance()->display_manager()->
       GetDisplayInfo(display.id()).device_scale_factor();
 #if defined(OS_CHROMEOS)
   // And use the nearest resource scale factor.
   const float cursor_scale = ui::GetScaleForScaleFactor(
       ui::GetSupportedScaleFactor(original_scale));
@@ skipping 79 matching lines @@
         disabled_cursor_location_);
   } else {
     disabled_cursor_location_ = aura::Env::GetInstance()->last_mouse_location();
   }
 
   SetVisibility(delegate->IsCursorVisible(), delegate);
   NotifyMouseEventsEnableStateChange(enabled);
 }
 
 }  // namespace ash