media/mojo/services/mojo_media_application_factory.h - 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: media/mojo/services/mojo_media_application_factory.h

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 | « media/mojo/services/mojo_media_application.cc ('k') | media/mojo/services/service_factory_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 #ifndef MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_	5 #ifndef MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_

6 #define MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_	6 #define MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_

7	7

8 #include <memory>	8 #include <memory>

9	9

10 #include "base/callback_forward.h"	10 #include "base/callback_forward.h"

11 #include "media/mojo/services/media_mojo_export.h"	11 #include "media/mojo/services/media_mojo_export.h"

12 #include "services/shell/public/cpp/service.h"	12 #include "services/service_manager/public/cpp/service.h"

13	13

14 namespace media {	14 namespace media {

15	15

16 // Creates a MojoMediaApplication instance using the default MojoMediaClient.	16 // Creates a MojoMediaApplication instance using the default MojoMediaClient.

17 std::unique_ptr<shell::Service> MEDIA_MOJO_EXPORT	17 std::unique_ptr<shell::Service> MEDIA_MOJO_EXPORT

18 CreateMojoMediaApplication(const base::Closure& quit_closure);	18 CreateMojoMediaApplication(const base::Closure& quit_closure);

19	19

20 } // namespace media	20 } // namespace media

21	21

22 #endif // MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_	22 #endif // MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_

OLD	NEW