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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/wm/ash_native_cursor_manager.cc ('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_test_base.h" 9 #include "ash/test/ash_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/root_window.h"
13 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_event_dispatcher.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 "base/message_loop/message_pump_x11.h" 19 #include "base/message_loop/message_pump_x11.h"
20 #endif 20 #endif
21 21
22 namespace ash { 22 namespace ash {
23 23
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 display_manager->OnNativeDisplaysChanged(display_info_list); 81 display_manager->OnNativeDisplaysChanged(display_info_list);
82 82
83 MoveMouseSync(Shell::GetAllRootWindows()[0], 10, 10); 83 MoveMouseSync(Shell::GetAllRootWindows()[0], 10, 10);
84 EXPECT_EQ(1.0f, test_api.GetDisplay().device_scale_factor()); 84 EXPECT_EQ(1.0f, test_api.GetDisplay().device_scale_factor());
85 85
86 MoveMouseSync(Shell::GetAllRootWindows()[0], 600, 10); 86 MoveMouseSync(Shell::GetAllRootWindows()[0], 600, 10);
87 EXPECT_EQ(2.0f, test_api.GetDisplay().device_scale_factor()); 87 EXPECT_EQ(2.0f, test_api.GetDisplay().device_scale_factor());
88 } 88 }
89 89
90 } // namespace ash 90 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/ash_native_cursor_manager.cc ('k') | ash/wm/ash_native_cursor_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698