OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/test/cursor_manager_test_api.h" | 5 #include "ash/test/cursor_manager_test_api.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/test/shell_test_api.h" | 8 #include "ash/test/shell_test_api.h" |
9 #include "ash/wm/native_cursor_manager_ash.h" | 9 #include "ash/wm/native_cursor_manager_ash.h" |
10 #include "ui/base/cursor/image_cursors.h" | 10 #include "ui/base/cursor/image_cursors.h" |
11 #include "ui/display/display.h" | 11 #include "ui/display/display.h" |
12 #include "ui/wm/core/cursor_manager.h" | 12 #include "ui/wm/core/cursor_manager.h" |
13 | 13 |
14 namespace ash { | 14 namespace ash { |
15 namespace test { | 15 namespace test { |
16 | 16 |
17 CursorManagerTestApi::CursorManagerTestApi(::wm::CursorManager* cursor_manager) | 17 CursorManagerTestApi::CursorManagerTestApi(::wm::CursorManager* cursor_manager) |
18 : cursor_manager_(cursor_manager) {} | 18 : cursor_manager_(cursor_manager) {} |
19 | 19 |
20 CursorManagerTestApi::~CursorManagerTestApi() {} | 20 CursorManagerTestApi::~CursorManagerTestApi() {} |
21 | 21 |
22 // TODO(tdanderson): CursorManagerTestApi may no longer be needed. | 22 // TODO(tdanderson): CursorManagerTestApi may no longer be needed. |
23 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const { | 23 ui::CursorSize CursorManagerTestApi::GetCurrentCursorSize() const { |
24 return cursor_manager_->GetCursorSet(); | 24 return cursor_manager_->GetCursorSize(); |
25 } | 25 } |
26 | 26 |
27 gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const { | 27 gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const { |
28 return cursor_manager_->GetCursor(); | 28 return cursor_manager_->GetCursor(); |
29 } | 29 } |
30 | 30 |
31 display::Display::Rotation CursorManagerTestApi::GetCurrentCursorRotation() | 31 display::Display::Rotation CursorManagerTestApi::GetCurrentCursorRotation() |
32 const { | 32 const { |
33 return ShellTestApi(Shell::Get()).native_cursor_manager_ash()->GetRotation(); | 33 return ShellTestApi(Shell::Get()).native_cursor_manager_ash()->GetRotation(); |
34 } | 34 } |
35 | 35 |
36 float CursorManagerTestApi::GetCurrentCursorScale() const { | 36 float CursorManagerTestApi::GetCurrentCursorScale() const { |
37 return ShellTestApi(Shell::Get()).native_cursor_manager_ash()->GetScale(); | 37 return ShellTestApi(Shell::Get()).native_cursor_manager_ash()->GetScale(); |
38 } | 38 } |
39 | 39 |
40 } // namespace test | 40 } // namespace test |
41 } // namespace ash | 41 } // namespace ash |
OLD | NEW |