diff options
Diffstat (limited to 'ash/test')
-rw-r--r-- | ash/test/cursor_manager_test_api.cc | 11 | ||||
-rw-r--r-- | ash/test/cursor_manager_test_api.h | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc index 22aa261..4ff7cf7 100644 --- a/ash/test/cursor_manager_test_api.cc +++ b/ash/test/cursor_manager_test_api.cc @@ -31,9 +31,16 @@ gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const { return cursor_manager_->GetCursor(); } -gfx::Display CursorManagerTestApi::GetDisplay() const { +gfx::Display::Rotation +CursorManagerTestApi::GetCurrentCursorRotation() const { return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> - image_cursors_->GetDisplay(); + image_cursors_->GetRotation(); +} + +float +CursorManagerTestApi::GetCurrentCursorScale() const { + return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> + image_cursors_->GetScale(); } } // namespace test diff --git a/ash/test/cursor_manager_test_api.h b/ash/test/cursor_manager_test_api.h index 1b9c6b8..fce98ca 100644 --- a/ash/test/cursor_manager_test_api.h +++ b/ash/test/cursor_manager_test_api.h @@ -7,12 +7,9 @@ #include "base/basictypes.h" #include "ui/base/cursor/cursor.h" +#include "ui/gfx/display.h" #include "ui/gfx/native_widget_types.h" -namespace gfx { -class Display; -} - namespace wm { class CursorManager; } @@ -28,7 +25,8 @@ class CursorManagerTestApi { ui::CursorSetType GetCurrentCursorSet() const; gfx::NativeCursor GetCurrentCursor() const; - gfx::Display GetDisplay() const; + gfx::Display::Rotation GetCurrentCursorRotation() const; + float GetCurrentCursorScale() const; private: ::wm::CursorManager* cursor_manager_; |