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