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

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

Issue 258893002: app_shell: Add support for mouse cursors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update build to exclude ImageCursors on android Created 6 years, 7 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
« no previous file with comments | « ash/display/cursor_window_controller.h ('k') | ash/wm/ash_native_cursor_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/base/cursor/image_cursors.h"
11 #include "ui/gfx/display.h" 11 #include "ui/gfx/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( 17 CursorManagerTestApi::CursorManagerTestApi(
18 wm::CursorManager* cursor_manager) 18 wm::CursorManager* cursor_manager)
19 : cursor_manager_(cursor_manager) { 19 : cursor_manager_(cursor_manager) {
20 } 20 }
(...skipping 17 matching lines...) Expand all
38 } 38 }
39 39
40 float 40 float
41 CursorManagerTestApi::GetCurrentCursorScale() const { 41 CursorManagerTestApi::GetCurrentCursorScale() const {
42 return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> 42 return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()->
43 image_cursors_->GetScale(); 43 image_cursors_->GetScale();
44 } 44 }
45 45
46 } // namespace test 46 } // namespace test
47 } // namespace ash 47 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/cursor_window_controller.h ('k') | ash/wm/ash_native_cursor_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698