ash/mus/test/wm_test_helper.cc - Issue 2314203002: Move DisplayList to display; add ScreenBase.

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/mus/test/wm_test_helper.cc

Issue 2314203002: Move DisplayList to display; add ScreenBase. (Closed)

Patch Set: Update unit test namespace. Created 4 years, 3 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/mus/test/wm_test_base.cc ('k') | ash/mus/test/wm_test_screen.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/mus/test/wm_test_helper.h"	5 #include "ash/mus/test/wm_test_helper.h"

6	6

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

8 #include "ash/common/test/material_design_controller_test_api.h"	8 #include "ash/common/test/material_design_controller_test_api.h"

9 #include "ash/mus/root_window_controller.h"	9 #include "ash/mus/root_window_controller.h"

10 #include "ash/mus/test/wm_test_screen.h"	10 #include "ash/mus/test/wm_test_screen.h"

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 window_tree_client_setup_.InitForWindowManager(	55 window_tree_client_setup_.InitForWindowManager(

56 window_manager_app_->window_manager_.get(),	56 window_manager_app_->window_manager_.get(),

57 window_manager_app_->window_manager_.get(), display);	57 window_manager_app_->window_manager_.get(), display);

58	58

59 window_manager_app_->InitWindowManager(	59 window_manager_app_->InitWindowManager(

60 window_tree_client_setup_.OwnWindowTreeClient());	60 window_tree_client_setup_.OwnWindowTreeClient());

61 ui::WindowTreeClient* window_tree_client =	61 ui::WindowTreeClient* window_tree_client =

62 window_manager_app_->window_manager()->window_tree_client();	62 window_manager_app_->window_manager()->window_tree_client();

63	63

64 screen_->display_list()->AddDisplay(display,	64 screen_->display_list()->AddDisplay(display,

65 views::DisplayList::Type::PRIMARY);	65 display::DisplayList::Type::PRIMARY);

66	66

67 ui::WindowTreeClientPrivate(window_tree_client)	67 ui::WindowTreeClientPrivate(window_tree_client)

68 .CallWmNewDisplayAdded(display);	68 .CallWmNewDisplayAdded(display);

69 }	69 }

70	70

71 } // namespace mus	71 } // namespace mus

72 } // namespace ash	72 } // namespace ash

OLD	NEW