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

Side by Side Diff: ash/wm/ash_native_cursor_manager_unittest.cc

Issue 258893002: app_shell: Add support for mouse cursors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove cursor copy and hopefully fix mac build 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/wm/ash_native_cursor_manager.h" 5 #include "ash/wm/ash_native_cursor_manager.h"
6 6
7 #include "ash/display/display_info.h" 7 #include "ash/display/display_info.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "ash/test/cursor_manager_test_api.h" 11 #include "ash/test/cursor_manager_test_api.h"
12 #include "ash/wm/image_cursors.h"
13 #include "ui/aura/test/test_window_delegate.h" 12 #include "ui/aura/test/test_window_delegate.h"
14 #include "ui/aura/test/test_windows.h" 13 #include "ui/aura/test/test_windows.h"
15 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
16 #include "ui/aura/window_event_dispatcher.h" 15 #include "ui/aura/window_event_dispatcher.h"
16 #include "ui/base/cursor/image_cursors.h"
17 #include "ui/gfx/screen.h" 17 #include "ui/gfx/screen.h"
18 18
19 #if defined(OS_WIN) 19 #if defined(OS_WIN)
20 #include "base/win/windows_version.h" 20 #include "base/win/windows_version.h"
21 #include "ui/base/cursor/cursor_loader_win.h" 21 #include "ui/base/cursor/cursor_loader_win.h"
22 #endif 22 #endif
23 23
24 namespace ash { 24 namespace ash {
25 namespace test { 25 namespace test {
26 26
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 gfx::Point mouse_location; 199 gfx::Point mouse_location;
200 EXPECT_TRUE(host->QueryMouseLocation(&mouse_location)); 200 EXPECT_TRUE(host->QueryMouseLocation(&mouse_location));
201 EXPECT_EQ("10,10", mouse_location.ToString()); 201 EXPECT_EQ("10,10", mouse_location.ToString());
202 Shell::GetInstance()->cursor_manager()->DisableMouseEvents(); 202 Shell::GetInstance()->cursor_manager()->DisableMouseEvents();
203 EXPECT_FALSE(host->QueryMouseLocation(&mouse_location)); 203 EXPECT_FALSE(host->QueryMouseLocation(&mouse_location));
204 EXPECT_EQ("0,0", mouse_location.ToString()); 204 EXPECT_EQ("0,0", mouse_location.ToString());
205 } 205 }
206 206
207 } // namespace test 207 } // namespace test
208 } // namespace ash 208 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698