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

Unified Diff: media/cdm/default_cdm_factory.h

Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use ScopedVector Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/cdm/default_cdm_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/default_cdm_factory.h
diff --git a/media/cdm/default_cdm_factory.h b/media/cdm/default_cdm_factory.h
index 72e0e8d941b85b33f496e700f403ca1c9144aa05..7060c7c47b5b730cd7ce85a30a04c52e44b6a50e 100644
--- a/media/cdm/default_cdm_factory.h
+++ b/media/cdm/default_cdm_factory.h
@@ -16,16 +16,16 @@ class DefaultCdmFactory : public CdmFactory {
~DefaultCdmFactory() final;
// CdmFactory implementation.
- scoped_ptr<MediaKeys> Create(
- const std::string& key_system,
- bool allow_distinctive_identifier,
- bool allow_persistent_state,
- const GURL& security_origin,
- const SessionMessageCB& session_message_cb,
- const SessionClosedCB& session_closed_cb,
- const LegacySessionErrorCB& legacy_session_error_cb,
- const SessionKeysChangeCB& session_keys_change_cb,
- const SessionExpirationUpdateCB& session_expiration_update_cb) final;
+ void Create(const std::string& key_system,
+ bool allow_distinctive_identifier,
+ bool allow_persistent_state,
+ const GURL& security_origin,
+ const SessionMessageCB& session_message_cb,
+ const SessionClosedCB& session_closed_cb,
+ const LegacySessionErrorCB& legacy_session_error_cb,
+ const SessionKeysChangeCB& session_keys_change_cb,
+ const SessionExpirationUpdateCB& session_expiration_update_cb,
+ const CdmCreatedCB& cdm_created_cb) final;
private:
DISALLOW_COPY_AND_ASSIGN(DefaultCdmFactory);
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/cdm/default_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698