ash/wm/ash_native_cursor_manager_interactive_uitest.cc - Issue 2084533008: mash: Migrate tray audio and deps to common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 6 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

« no previous file with comments | « ash/touch/touchscreen_util_unittest.cc ('k') | ash/wm/ash_native_cursor_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/common/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)

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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

OLD	NEW