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

Unified Diff: media/mojo/services/service_factory_impl.h

Issue 2016053003: Add audio_device_id in mojo media ServiceFactory CreateRenderer api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fixes according to comments. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/mojo_media_client.cc ('k') | media/mojo/services/service_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/service_factory_impl.h
diff --git a/media/mojo/services/service_factory_impl.h b/media/mojo/services/service_factory_impl.h
index ce970c9c0dccf4c5f9a398576d5f8f0ca7240743..bde5d145f921d4843c1b5a70dd7439f4a08934b1 100644
--- a/media/mojo/services/service_factory_impl.h
+++ b/media/mojo/services/service_factory_impl.h
@@ -6,6 +6,7 @@
#define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
#include <memory>
+#include <string>
#include "base/macros.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
@@ -39,16 +40,11 @@ class ServiceFactoryImpl : public mojom::ServiceFactory {
// mojom::ServiceFactory implementation.
void CreateAudioDecoder(mojom::AudioDecoderRequest request) final;
void CreateVideoDecoder(mojom::VideoDecoderRequest request) final;
- void CreateRenderer(mojom::RendererRequest request) final;
+ void CreateRenderer(mojom::RendererRequest request,
+ const std::string& audio_device_id) final;
xhwang 2016/06/02 21:53:50 Is this what the service_factory.mojom.h file is g
tianyuwang1 2016/06/03 00:21:16 Fixed. service_factory.mojom.h is generating mojo
void CreateCdm(mojom::ContentDecryptionModuleRequest request) final;
private:
-#if defined(ENABLE_MOJO_RENDERER)
- RendererFactory* GetRendererFactory();
-
- std::unique_ptr<RendererFactory> renderer_factory_;
-#endif // defined(ENABLE_MOJO_RENDERER)
-
#if defined(ENABLE_MOJO_CDM)
CdmFactory* GetCdmFactory();
« no previous file with comments | « media/mojo/services/mojo_media_client.cc ('k') | media/mojo/services/service_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698