Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(916)

Side by Side Diff: media/mojo/services/service_factory_impl.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
OLDNEW
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 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 5 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "media/mojo/interfaces/service_factory.mojom.h" 11 #include "media/mojo/interfaces/service_factory.mojom.h"
12 #include "media/mojo/services/mojo_cdm_service_context.h" 12 #include "media/mojo/services/mojo_cdm_service_context.h"
13 #include "services/shell/public/cpp/connector.h" 13 #include "services/service_manager/public/cpp/connector.h"
14 #include "services/shell/public/cpp/service_context_ref.h" 14 #include "services/service_manager/public/cpp/service_context_ref.h"
15 15
16 namespace shell { 16 namespace shell {
17 namespace mojom { 17 namespace mojom {
18 class InterfaceProvider; 18 class InterfaceProvider;
19 } 19 }
20 } 20 }
21 21
22 namespace media { 22 namespace media {
23 23
24 class CdmFactory; 24 class CdmFactory;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 scoped_refptr<MediaLog> media_log_; 64 scoped_refptr<MediaLog> media_log_;
65 std::unique_ptr<shell::ServiceContextRef> connection_ref_; 65 std::unique_ptr<shell::ServiceContextRef> connection_ref_;
66 MojoMediaClient* mojo_media_client_; 66 MojoMediaClient* mojo_media_client_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl); 68 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
69 }; 69 };
70 70
71 } // namespace media 71 } // namespace media
72 72
73 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 73 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_media_application_factory.h ('k') | media/mojo/services/service_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698