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

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

Issue 226293005: Use platform's device scale factor for cursor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new tests Created 6 years, 8 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 | Annotate | Revision Log
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 "ash/wm/image_cursors.h" 10 #include "ash/wm/image_cursors.h"
(...skipping 13 matching lines...) Expand all
24 24
25 // TODO(tdanderson): CursorManagerTestApi may no longer be needed. 25 // TODO(tdanderson): CursorManagerTestApi may no longer be needed.
26 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const { 26 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const {
27 return cursor_manager_->GetCursorSet(); 27 return cursor_manager_->GetCursorSet();
28 } 28 }
29 29
30 gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const { 30 gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const {
31 return cursor_manager_->GetCursor(); 31 return cursor_manager_->GetCursor();
32 } 32 }
33 33
34 gfx::Display CursorManagerTestApi::GetDisplay() const { 34 gfx::Display::Rotation
35 CursorManagerTestApi::GetCurrentCursorRotation() const {
35 return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> 36 return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()->
36 image_cursors_->GetDisplay(); 37 image_cursors_->GetRotation();
38 }
39
40 float
41 CursorManagerTestApi::GetCurrentCursorScale() const {
42 return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()->
43 image_cursors_->GetScale();
37 } 44 }
38 45
39 } // namespace test 46 } // namespace test
40 } // namespace ash 47 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698