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/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/aura_test_utils.h" | 12 #include "ui/aura/test/aura_test_utils.h" |
14 #include "ui/aura/test/test_window_delegate.h" | 13 #include "ui/aura/test/test_window_delegate.h" |
15 #include "ui/aura/test/test_windows.h" | 14 #include "ui/aura/test/test_windows.h" |
16 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
17 #include "ui/aura/window_event_dispatcher.h" | 16 #include "ui/aura/window_event_dispatcher.h" |
| 17 #include "ui/base/cursor/image_cursors.h" |
18 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
19 | 19 |
20 #if defined(OS_WIN) | 20 #if defined(OS_WIN) |
21 #include "base/win/windows_version.h" | 21 #include "base/win/windows_version.h" |
22 #include "ui/base/cursor/cursor_loader_win.h" | 22 #include "ui/base/cursor/cursor_loader_win.h" |
23 #endif | 23 #endif |
24 | 24 |
25 namespace ash { | 25 namespace ash { |
26 namespace test { | 26 namespace test { |
27 | 27 |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor()); | 170 Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor()); |
171 EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor()); | 171 EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor()); |
172 display_manager->SetDisplayUIScale(display_id, 2.0f); | 172 display_manager->SetDisplayUIScale(display_id, 2.0f); |
173 EXPECT_EQ(1.0f, | 173 EXPECT_EQ(1.0f, |
174 Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor()); | 174 Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor()); |
175 EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor()); | 175 EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor()); |
176 } | 176 } |
177 | 177 |
178 } // namespace test | 178 } // namespace test |
179 } // namespace ash | 179 } // namespace ash |
OLD | NEW |