Rename gfx::Display/Screen to display::Display/Screen in views/wm

ui/wm/core/cursor_manager.cc

 // Copyright (c) 2013 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 "ui/wm/core/cursor_manager.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 144 matching lines @@
       IsMouseEventsEnabled() != state_on_unlock_->mouse_events_enabled()) {
     delegate_->SetMouseEventsEnabled(state_on_unlock_->mouse_events_enabled(),
                                      this);
   }
 }
 
 bool CursorManager::IsMouseEventsEnabled() const {
   return current_state_->mouse_events_enabled();
 }
 
-void CursorManager::SetDisplay(const gfx::Display& display) {
+void CursorManager::SetDisplay(const display::Display& display) {
   delegate_->SetDisplay(display, this);
 }
 
 void CursorManager::LockCursor() {
   cursor_lock_count_++;
 }
 
 void CursorManager::UnlockCursor() {
   cursor_lock_count_--;
   DCHECK_GE(cursor_lock_count_, 0);
@@ skipping 46 matching lines @@
 
 void CursorManager::CommitCursorSet(ui::CursorSetType cursor_set) {
   current_state_->set_cursor_set(cursor_set);
 }
 
 void CursorManager::CommitMouseEventsEnabled(bool enabled) {
   current_state_->SetMouseEventsEnabled(enabled);
 }
 
 }  // namespace wm