services/ui/ws/display.cc - Issue 2419723002: Move services/shell to services/service_manager

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: services/ui/ws/display.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 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 | « services/ui/ws/BUILD.gn ('k') | services/ui/ws/display_binding.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "services/ui/ws/display.h"	5 #include "services/ui/ws/display.h"

6	6

7 #include <set>	7 #include <set>

8 #include <utility>	8 #include <utility>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/debug/debugger.h"	11 #include "base/debug/debugger.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "mojo/common/common_type_converters.h"	13 #include "mojo/common/common_type_converters.h"

14 #include "services/shell/public/interfaces/connector.mojom.h"	14 #include "services/service_manager/public/interfaces/connector.mojom.h"

15 #include "services/ui/common/types.h"	15 #include "services/ui/common/types.h"

16 #include "services/ui/public/interfaces/cursor.mojom.h"	16 #include "services/ui/public/interfaces/cursor.mojom.h"

17 #include "services/ui/ws/display_binding.h"	17 #include "services/ui/ws/display_binding.h"

18 #include "services/ui/ws/display_manager.h"	18 #include "services/ui/ws/display_manager.h"

19 #include "services/ui/ws/focus_controller.h"	19 #include "services/ui/ws/focus_controller.h"

20 #include "services/ui/ws/platform_display.h"	20 #include "services/ui/ws/platform_display.h"

21 #include "services/ui/ws/platform_display_init_params.h"	21 #include "services/ui/ws/platform_display_init_params.h"

22 #include "services/ui/ws/user_activity_monitor.h"	22 #include "services/ui/ws/user_activity_monitor.h"

23 #include "services/ui/ws/window_manager_display_root.h"	23 #include "services/ui/ws/window_manager_display_root.h"

24 #include "services/ui/ws/window_manager_state.h"	24 #include "services/ui/ws/window_manager_state.h"

(...skipping 375 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
400 }	400 }

401	401

402 void Display::OnWindowManagerWindowTreeFactoryReady(	402 void Display::OnWindowManagerWindowTreeFactoryReady(

403 WindowManagerWindowTreeFactory* factory) {	403 WindowManagerWindowTreeFactory* factory) {

404 if (!binding_)	404 if (!binding_)

405 CreateWindowManagerDisplayRootFromFactory(factory);	405 CreateWindowManagerDisplayRootFromFactory(factory);

406 }	406 }

407	407

408 } // namespace ws	408 } // namespace ws

409 } // namespace ui	409 } // namespace ui

OLD	NEW