mash/package/mash_packaged_service.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: mash/package/mash_packaged_service.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 | « mash/package/mash_packaged_service.h ('k') | mash/quick_launch/BUILD.gn » ('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 "mash/package/mash_packaged_service.h"	5 #include "mash/package/mash_packaged_service.h"

6	6

7 #include "ash/autoclick/mus/autoclick_application.h"	7 #include "ash/autoclick/mus/autoclick_application.h"

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

9 #include "ash/touch_hud/mus/touch_hud_application.h"	9 #include "ash/touch_hud/mus/touch_hud_application.h"

10 #include "mash/app_driver/app_driver.h"	10 #include "mash/app_driver/app_driver.h"

11 #include "mash/quick_launch/quick_launch.h"	11 #include "mash/quick_launch/quick_launch.h"

12 #include "mash/session/session.h"	12 #include "mash/session/session.h"

13 #include "mash/task_viewer/task_viewer.h"	13 #include "mash/task_viewer/task_viewer.h"

14 #include "services/shell/public/cpp/service_context.h"	14 #include "services/service_manager/public/cpp/service_context.h"

15 #include "services/ui/ime/test_ime_driver/test_ime_application.h"	15 #include "services/ui/ime/test_ime_driver/test_ime_application.h"

16 #include "services/ui/service.h"	16 #include "services/ui/service.h"

17	17

18 #if defined(OS_LINUX)	18 #if defined(OS_LINUX)

19 #include "components/font_service/font_service_app.h"	19 #include "components/font_service/font_service_app.h"

20 #endif	20 #endif

21	21

22 namespace mash {	22 namespace mash {

23	23

24 MashPackagedService::MashPackagedService() {}	24 MashPackagedService::MashPackagedService() {}

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 #if defined(OS_LINUX)	75 #if defined(OS_LINUX)

76 if (name == "service:font_service")	76 if (name == "service:font_service")

77 return base::WrapUnique(new font_service::FontServiceApp);	77 return base::WrapUnique(new font_service::FontServiceApp);

78 #endif	78 #endif

79 if (name == "service:app_driver")	79 if (name == "service:app_driver")

80 return base::WrapUnique(new mash::app_driver::AppDriver);	80 return base::WrapUnique(new mash::app_driver::AppDriver);

81 return nullptr;	81 return nullptr;

82 }	82 }

83	83

84 } // namespace mash	84 } // namespace mash

OLD	NEW