ash/mus/test/wm_test_helper.cc - Issue 2182633011: Replaces ::ui:: with ui:: in ash

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 2182633011: Replaces ::ui:: with ui:: in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/mus/test/wm_test_helper.h ('k') | ash/mus/user_window_controller_impl.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/mus/root_window_controller.h"	7 #include "ash/mus/root_window_controller.h"

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

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

10 #include "ash/mus/window_manager_application.h"	10 #include "ash/mus/window_manager_application.h"

(...skipping 29 matching lines...) Expand all Loading...
40 window_tree_client_setup_.InitForWindowManager(	40 window_tree_client_setup_.InitForWindowManager(

41 window_manager_app_.window_manager_.get(),	41 window_manager_app_.window_manager_.get(),

42 window_manager_app_.window_manager_.get(), display);	42 window_manager_app_.window_manager_.get(), display);

43	43

44 window_manager_app_.InitWindowManager(	44 window_manager_app_.InitWindowManager(

45 window_tree_client_setup_.window_tree_client());	45 window_tree_client_setup_.window_tree_client());

46	46

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

48 views::DisplayList::Type::PRIMARY);	48 views::DisplayList::Type::PRIMARY);

49	49

50 ::ui::WindowTreeClientPrivate(window_tree_client_setup_.window_tree_client())	50 ui::WindowTreeClientPrivate(window_tree_client_setup_.window_tree_client())

51 .CallWmNewDisplayAdded(display);	51 .CallWmNewDisplayAdded(display);

52 }	52 }

53	53

54 } // namespace mus	54 } // namespace mus

55 } // namespace ash	55 } // namespace ash

OLD	NEW