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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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
« no previous file with comments | « ash/wm/ash_native_cursor_manager.h ('k') | ash/wm/ash_native_cursor_manager_unittest.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "ash/wm/ash_native_cursor_manager.h" 4 #include "ash/wm/ash_native_cursor_manager.h"
5 5
6 #include "ash/display/display_info.h" 6 #include "ash/display/display_info.h"
7 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/test/ash_interactive_ui_test_base.h" 9 #include "ash/test/ash_interactive_ui_test_base.h"
10 #include "ash/test/cursor_manager_test_api.h" 10 #include "ash/test/cursor_manager_test_api.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_tree_host.h" 13 #include "ui/aura/window_tree_host.h"
14 #include "ui/base/test/ui_controls.h" 14 #include "ui/base/test/ui_controls.h"
15 15
16 #if defined(USE_X11) 16 #if defined(USE_X11)
17 #include <X11/Xlib.h> 17 #include <X11/Xlib.h>
18 18
19 #include "ui/gfx/x/x11_types.h" 19 #include "ui/gfx/x/x11_types.h"
20 #endif 20 #endif
21 21
22 namespace ash { 22 namespace ash {
23 23
24 using AshNativeCursorManagerTest = test::AshInteractiveUITestBase; 24 using AshNativeCursorManagerTest = test::AshInteractiveUITestBase;
25 25
26 namespace { 26 namespace {
27 27
28 DisplayInfo CreateDisplayInfo(int64 id, 28 DisplayInfo CreateDisplayInfo(int64_t id,
29 const gfx::Rect& bounds, 29 const gfx::Rect& bounds,
30 float device_scale_factor) { 30 float device_scale_factor) {
31 DisplayInfo info(id, "", false); 31 DisplayInfo info(id, "", false);
32 info.SetBounds(bounds); 32 info.SetBounds(bounds);
33 info.set_device_scale_factor(device_scale_factor); 33 info.set_device_scale_factor(device_scale_factor);
34 return info; 34 return info;
35 } 35 }
36 36
37 void MoveMouseSync(aura::Window* window, int x, int y) { 37 void MoveMouseSync(aura::Window* window, int x, int y) {
38 #if defined(USE_X11) 38 #if defined(USE_X11)
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 display_manager->OnNativeDisplaysChanged(display_info_list); 79 display_manager->OnNativeDisplaysChanged(display_info_list);
80 80
81 MoveMouseSync(Shell::GetAllRootWindows()[0], 10, 10); 81 MoveMouseSync(Shell::GetAllRootWindows()[0], 10, 10);
82 EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor()); 82 EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
83 83
84 MoveMouseSync(Shell::GetAllRootWindows()[0], 600, 10); 84 MoveMouseSync(Shell::GetAllRootWindows()[0], 600, 10);
85 EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor()); 85 EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
86 } 86 }
87 87
88 } // namespace ash 88 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/ash_native_cursor_manager.h ('k') | ash/wm/ash_native_cursor_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698