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

Unified Diff: media/mojo/services/mojo_renderer_factory.cc

Issue 1541943002: Delete media::Interfaces::ServiceFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add service bundle Created 5 years 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_renderer_factory.h ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_factory.cc
diff --git a/media/mojo/services/mojo_renderer_factory.cc b/media/mojo/services/mojo_renderer_factory.cc
index 8112c7c66fa5a3c3b0c7eeae079e0b2e9c6938ad..eda509605ddafb2a4495441b1aba2e732969e74f 100644
--- a/media/mojo/services/mojo_renderer_factory.cc
+++ b/media/mojo/services/mojo_renderer_factory.cc
@@ -4,17 +4,16 @@
#include "media/mojo/services/mojo_renderer_factory.h"
-#include "base/single_thread_task_runner.h"
-#include "media/mojo/interfaces/service_factory.mojom.h"
+#include "media/mojo/interfaces/renderer.mojom.h"
#include "media/mojo/services/mojo_renderer_impl.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/application/public/cpp/connect.h"
namespace media {
MojoRendererFactory::MojoRendererFactory(
- interfaces::ServiceFactory* service_factory)
- : service_factory_(service_factory) {
- DCHECK(service_factory_);
+ mojo::ServiceProvider* service_provider)
+ : service_provider_(service_provider) {
+ DCHECK(service_provider_);
}
MojoRendererFactory::~MojoRendererFactory() {
@@ -25,11 +24,10 @@ scoped_ptr<Renderer> MojoRendererFactory::CreateRenderer(
const scoped_refptr<base::TaskRunner>& /* worker_task_runner */,
AudioRendererSink* /* audio_renderer_sink */,
VideoRendererSink* /* video_renderer_sink */) {
- DCHECK(service_factory_);
+ DCHECK(service_provider_);
interfaces::RendererPtr mojo_renderer;
- service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer));
-
+ mojo::ConnectToService(service_provider_, &mojo_renderer);
return scoped_ptr<Renderer>(
new MojoRendererImpl(media_task_runner, mojo_renderer.Pass()));
}
« no previous file with comments | « media/mojo/services/mojo_renderer_factory.h ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698