ash/display/window_tree_host_manager_unittest.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

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/display/window_tree_host_manager_unittest.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 years, 4 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/display/screen_ash.cc ('k') | ash/first_run/first_run_helper_impl.cc » ('j') | no next file with comments »

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/display/window_tree_host_manager.h"	5 #include "ash/display/window_tree_host_manager.h"

6	6

7 #include <memory>	7 #include <memory>

8	8

9 #include "ash/aura/wm_window_aura.h"	9 #include "ash/aura/wm_window_aura.h"

10 #include "ash/common/ash_switches.h"	10 #include "ash/common/ash_switches.h"

11 #include "ash/common/display/display_info.h"	11 #include "ash/common/display/display_info.h"

12 #include "ash/common/material_design/material_design_controller.h"	12 #include "ash/common/material_design/material_design_controller.h"

	13 #include "ash/common/shelf/shelf.h"

	14 #include "ash/common/shelf/shelf_widget.h"

13 #include "ash/common/wm/window_state.h"	15 #include "ash/common/wm/window_state.h"

14 #include "ash/common/wm/wm_event.h"	16 #include "ash/common/wm/wm_event.h"

15 #include "ash/common/wm/wm_screen_util.h"	17 #include "ash/common/wm/wm_screen_util.h"

16 #include "ash/display/display_manager.h"	18 #include "ash/display/display_manager.h"

17 #include "ash/display/display_util.h"	19 #include "ash/display/display_util.h"

18 #include "ash/screen_util.h"	20 #include "ash/screen_util.h"

19 #include "ash/shelf/shelf.h"

20 #include "ash/shelf/shelf_widget.h"

21 #include "ash/shell.h"	21 #include "ash/shell.h"

22 #include "ash/test/ash_md_test_base.h"	22 #include "ash/test/ash_md_test_base.h"

23 #include "ash/test/ash_test_base.h"	23 #include "ash/test/ash_test_base.h"

24 #include "ash/test/ash_test_helper.h"	24 #include "ash/test/ash_test_helper.h"

25 #include "ash/test/cursor_manager_test_api.h"	25 #include "ash/test/cursor_manager_test_api.h"

26 #include "ash/test/display_manager_test_api.h"	26 #include "ash/test/display_manager_test_api.h"

27 #include "ash/test/test_shell_delegate.h"	27 #include "ash/test/test_shell_delegate.h"

28 #include "ash/wm/window_state_aura.h"	28 #include "ash/wm/window_state_aura.h"

29 #include "base/command_line.h"	29 #include "base/command_line.h"

30 #include "ui/aura/client/focus_change_observer.h"	30 #include "ui/aura/client/focus_change_observer.h"

(...skipping 1496 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1527 widget->GetNativeWindow()->GetRootWindow());	1527 widget->GetNativeWindow()->GetRootWindow());

1528 event_generator.MoveMouseToCenterOf(widget->GetNativeWindow());	1528 event_generator.MoveMouseToCenterOf(widget->GetNativeWindow());

1529	1529

1530 UpdateDisplay("300x300");	1530 UpdateDisplay("300x300");

1531 watcher.Stop();	1531 watcher.Stop();

1532	1532

1533 widget->CloseNow();	1533 widget->CloseNow();

1534 }	1534 }

1535	1535

1536 } // namespace ash	1536 } // namespace ash

OLD	NEW