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

Side by Side Diff: media/mojo/services/media_service.h

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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/interface_factory_impl.cc ('k') | media/mojo/services/media_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_MEDIA_SERVICE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MEDIA_SERVICE_H_
6 #define MEDIA_MOJO_SERVICES_MEDIA_SERVICE_H_ 6 #define MEDIA_MOJO_SERVICES_MEDIA_SERVICE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "media/base/media_log.h"
15 #include "media/mojo/interfaces/interface_factory.mojom.h" 16 #include "media/mojo/interfaces/interface_factory.mojom.h"
16 #include "media/mojo/interfaces/media_service.mojom.h" 17 #include "media/mojo/interfaces/media_service.mojom.h"
17 #include "media/mojo/services/media_mojo_export.h" 18 #include "media/mojo/services/media_mojo_export.h"
18 #include "mojo/public/cpp/bindings/binding_set.h" 19 #include "mojo/public/cpp/bindings/binding_set.h"
19 #include "services/service_manager/public/cpp/binder_registry.h" 20 #include "services/service_manager/public/cpp/binder_registry.h"
20 #include "services/service_manager/public/cpp/interface_factory.h" 21 #include "services/service_manager/public/cpp/interface_factory.h"
21 #include "services/service_manager/public/cpp/service.h" 22 #include "services/service_manager/public/cpp/service.h"
22 #include "services/service_manager/public/cpp/service_context.h" 23 #include "services/service_manager/public/cpp/service_context.h"
23 #include "services/service_manager/public/cpp/service_context_ref.h" 24 #include "services/service_manager/public/cpp/service_context_ref.h"
24 #include "url/gurl.h" 25 #include "url/gurl.h"
25 26
26 namespace media { 27 namespace media {
27 28
28 class MediaLog;
29 class MojoMediaClient; 29 class MojoMediaClient;
30 30
31 class MEDIA_MOJO_EXPORT MediaService 31 class MEDIA_MOJO_EXPORT MediaService
32 : public NON_EXPORTED_BASE(service_manager::Service), 32 : public NON_EXPORTED_BASE(service_manager::Service),
33 public NON_EXPORTED_BASE( 33 public NON_EXPORTED_BASE(
34 service_manager::InterfaceFactory<mojom::MediaService>), 34 service_manager::InterfaceFactory<mojom::MediaService>),
35 public NON_EXPORTED_BASE(mojom::MediaService) { 35 public NON_EXPORTED_BASE(mojom::MediaService) {
36 public: 36 public:
37 explicit MediaService(std::unique_ptr<MojoMediaClient> mojo_media_client); 37 explicit MediaService(std::unique_ptr<MojoMediaClient> mojo_media_client);
38 ~MediaService() final; 38 ~MediaService() final;
(...skipping 13 matching lines...) Expand all
52 // mojom::MediaService implementation. 52 // mojom::MediaService implementation.
53 void CreateInterfaceFactory( 53 void CreateInterfaceFactory(
54 mojom::InterfaceFactoryRequest request, 54 mojom::InterfaceFactoryRequest request,
55 service_manager::mojom::InterfaceProviderPtr host_interfaces) final; 55 service_manager::mojom::InterfaceProviderPtr host_interfaces) final;
56 56
57 // Note: Since each instance runs on a different thread, do not share a common 57 // Note: Since each instance runs on a different thread, do not share a common
58 // MojoMediaClient with other instances to avoid threading issues. Hence using 58 // MojoMediaClient with other instances to avoid threading issues. Hence using
59 // a unique_ptr here. 59 // a unique_ptr here.
60 std::unique_ptr<MojoMediaClient> mojo_media_client_; 60 std::unique_ptr<MojoMediaClient> mojo_media_client_;
61 61
62 scoped_refptr<MediaLog> media_log_; 62 MediaLog media_log_;
63 std::unique_ptr<service_manager::ServiceContextRefFactory> ref_factory_; 63 std::unique_ptr<service_manager::ServiceContextRefFactory> ref_factory_;
64 64
65 service_manager::BinderRegistry registry_; 65 service_manager::BinderRegistry registry_;
66 mojo::BindingSet<mojom::MediaService> bindings_; 66 mojo::BindingSet<mojom::MediaService> bindings_;
67 }; 67 };
68 68
69 } // namespace media 69 } // namespace media
70 70
71 #endif // MEDIA_MOJO_SERVICES_MEDIA_SERVICE_H_ 71 #endif // MEDIA_MOJO_SERVICES_MEDIA_SERVICE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/interface_factory_impl.cc ('k') | media/mojo/services/media_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698