| 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/ash_native_cursor_manager.h" | 9 #include "ash/wm/ash_native_cursor_manager.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 } | |
| 22 | 21 |
| 23 // TODO(tdanderson): CursorManagerTestApi may no longer be needed. | 22 // TODO(tdanderson): CursorManagerTestApi may no longer be needed. |
| 24 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const { | 23 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const { |
| 25 return cursor_manager_->GetCursorSet(); | 24 return cursor_manager_->GetCursorSet(); |
| 26 } | 25 } |
| 27 | 26 |
| 28 gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const { | 27 gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const { |
| 29 return cursor_manager_->GetCursor(); | 28 return cursor_manager_->GetCursor(); |
| 30 } | 29 } |
| 31 | 30 |
| 32 display::Display::Rotation CursorManagerTestApi::GetCurrentCursorRotation() | 31 display::Display::Rotation CursorManagerTestApi::GetCurrentCursorRotation() |
| 33 const { | 32 const { |
| 34 return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> | 33 return ShellTestApi(Shell::GetInstance()) |
| 35 image_cursors_->GetRotation(); | 34 .ash_native_cursor_manager() |
| 35 ->image_cursors_->GetRotation(); |
| 36 } | 36 } |
| 37 | 37 |
| 38 float | 38 float CursorManagerTestApi::GetCurrentCursorScale() const { |
| 39 CursorManagerTestApi::GetCurrentCursorScale() const { | 39 return ShellTestApi(Shell::GetInstance()) |
| 40 return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> | 40 .ash_native_cursor_manager() |
| 41 image_cursors_->GetScale(); | 41 ->image_cursors_->GetScale(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 } // namespace test | 44 } // namespace test |
| 45 } // namespace ash | 45 } // namespace ash |
| OLD | NEW |