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

Unified Diff: chromecast/browser/media/cast_browser_cdm_factory.h

Issue 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment for DEPS change. Created 5 years, 1 month 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
Index: chromecast/browser/media/cast_browser_cdm_factory.h
diff --git a/chromecast/browser/media/cast_browser_cdm_factory.h b/chromecast/browser/media/cast_browser_cdm_factory.h
index c55b8fa3c8c36b0a3e3b3f78daa4bbff16e8acc3..22c31bcdb2db81cc2d99087aa27ee625a666b342 100644
--- a/chromecast/browser/media/cast_browser_cdm_factory.h
+++ b/chromecast/browser/media/cast_browser_cdm_factory.h
@@ -6,7 +6,7 @@
#define CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_
#include "chromecast/media/base/key_systems_common.h"
-#include "media/base/browser_cdm_factory.h"
+#include "media/base/cdm_factory.h"
#include "media/base/media_keys.h"
namespace chromecast {
@@ -14,25 +14,26 @@ namespace media {
class BrowserCdmCast;
-class CastBrowserCdmFactory : public ::media::BrowserCdmFactory {
+class CastBrowserCdmFactory : public ::media::CdmFactory {
public:
CastBrowserCdmFactory() {}
~CastBrowserCdmFactory() override {};
- // ::media::BrowserCdmFactory implementation:
- scoped_refptr<::media::MediaKeys> CreateBrowserCdm(
+ // ::media::CdmFactory implementation:
+ void Create(
const std::string& key_system,
- bool use_hw_secure_codecs,
+ const GURL& security_origin,
+ const ::media::CdmConfig& cdm_config,
const ::media::SessionMessageCB& session_message_cb,
const ::media::SessionClosedCB& session_closed_cb,
const ::media::LegacySessionErrorCB& legacy_session_error_cb,
const ::media::SessionKeysChangeCB& session_keys_change_cb,
- const ::media::SessionExpirationUpdateCB& session_expiration_update_cb)
- override;
+ const ::media::SessionExpirationUpdateCB& session_expiration_update_cb,
+ const ::media::CdmCreatedCB& cdm_created_cb) override;
// Provides a platform-specific BrowserCdm instance.
virtual scoped_refptr<BrowserCdmCast> CreatePlatformBrowserCdm(
- const CastKeySystem& key_system);
+ const CastKeySystem& cast_key_system);
private:
DISALLOW_COPY_AND_ASSIGN(CastBrowserCdmFactory);
« no previous file with comments | « chromecast/browser/cast_content_browser_client.cc ('k') | chromecast/browser/media/cast_browser_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698