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

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

Issue 1209283003: FrameMojoShell provides services to mojo apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 5 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/DEPS ('k') | media/mojo/services/mojo_cdm_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_service.h
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index 770b4b8f44170d68e3a5c7cae8eaa9b813bbed74..74ed40427ffdae68986b65f60ebc7619d196ae3b 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -11,7 +11,8 @@
#include "base/memory/weak_ptr.h"
#include "media/base/media_keys.h"
#include "media/mojo/interfaces/content_decryption_module.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
namespace media {
@@ -22,6 +23,7 @@ class MojoCdmService : public mojo::ContentDecryptionModule {
public:
// Constructs a MojoCdmService and strongly binds it to the |request|.
MojoCdmService(MojoCdmServiceContext* context,
+ mojo::ServiceProvider* service_provider,
mojo::InterfaceRequest<mojo::ContentDecryptionModule> request);
~MojoCdmService() final;
@@ -79,8 +81,8 @@ class MojoCdmService : public mojo::ContentDecryptionModule {
const std::string& error_message);
mojo::StrongBinding<mojo::ContentDecryptionModule> binding_;
-
MojoCdmServiceContext* context_;
+ mojo::ServiceProvider* service_provider_;
scoped_ptr<MediaKeys> cdm_;
// Set to a valid CDM ID if the |cdm_| is successfully created.
« no previous file with comments | « media/mojo/DEPS ('k') | media/mojo/services/mojo_cdm_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698