Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: ash/test/cursor_manager_test_api.cc

Issue 2932563002: Implement cursor changing on Mushrome (Closed)
Patch Set: Remove last NOTIMPLEMENTED for this patch Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 12 matching lines...) Expand all
23 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const { 23 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const {
24 return cursor_manager_->GetCursorSet(); 24 return cursor_manager_->GetCursorSet();
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()) 33 return ShellTestApi(Shell::Get()).ash_native_cursor_manager()->GetRotation();
34 .ash_native_cursor_manager()
35 ->image_cursors_->GetRotation();
36 } 34 }
37 35
38 float CursorManagerTestApi::GetCurrentCursorScale() const { 36 float CursorManagerTestApi::GetCurrentCursorScale() const {
39 return ShellTestApi(Shell::Get()) 37 return ShellTestApi(Shell::Get()).ash_native_cursor_manager()->GetScale();
40 .ash_native_cursor_manager()
41 ->image_cursors_->GetScale();
42 } 38 }
43 39
44 } // namespace test 40 } // namespace test
45 } // namespace ash 41 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698