Move gfx::Display/Screen to display::Display/Screen in aura/events

ui/aura/test/test_cursor_client.h

 // Copyright 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.
 
 #ifndef UI_AURA_TEST_TEST_CURSOR_CLIENT_H_
 #define UI_AURA_TEST_TEST_CURSOR_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
@@ skipping 24 matching lines @@
   void SetCursor(gfx::NativeCursor cursor) override;
   gfx::NativeCursor GetCursor() const override;
   void ShowCursor() override;
   void HideCursor() override;
   void SetCursorSet(ui::CursorSetType cursor_set) override;
   ui::CursorSetType GetCursorSet() const override;
   bool IsCursorVisible() const override;
   void EnableMouseEvents() override;
   void DisableMouseEvents() override;
   bool IsMouseEventsEnabled() const override;
-  void SetDisplay(const gfx::Display& display) override;
+  void SetDisplay(const display::Display& display) override;
   void LockCursor() override;
   void UnlockCursor() override;
   bool IsCursorLocked() const override;
   void AddObserver(aura::client::CursorClientObserver* observer) override;
   void RemoveObserver(aura::client::CursorClientObserver* observer) override;
   bool ShouldHideCursorOnKeyEvent(const ui::KeyEvent& event) const override;
 
  private:
   bool visible_;
   bool should_hide_cursor_on_key_event_;
   bool mouse_events_enabled_;
   int cursor_lock_count_;
   int calls_to_set_cursor_;
   base::ObserverList<aura::client::CursorClientObserver> observers_;
   aura::Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCursorClient);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif // UI_AURA_TEST_TEST_CURSOR_CLIENT_H_