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

Unified Diff: chromecast/browser/cast_content_browser_client.h

Issue 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: real changes 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/cast_content_browser_client.h
diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h
index 11763b8b041650755f2140fb504e4dab8963ede0..12129e3293a8d8c8110362491be68196c2596ec2 100644
--- a/chromecast/browser/cast_content_browser_client.h
+++ b/chromecast/browser/cast_content_browser_client.h
@@ -71,10 +71,6 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
// instance.
virtual scoped_refptr<media::CmaMediaPipelineClient>
CreateCmaMediaPipelineClient();
-
- // Creates and returns a factory used for creating BrowserCdm instances for
- // playing protected content. This is called once per browser lifetime.
- virtual scoped_ptr<::media::BrowserCdmFactory> CreateBrowserCdmFactory();
#endif
// Performs cleanup for process exit (but before AtExitManager cleanup).
@@ -150,6 +146,7 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
content::FileDescriptorInfo* mappings,
std::map<int, base::MemoryMappedFile::Region>* regions) override;
#else
+ scoped_ptr<::media::CdmFactory> CreateCdmFactory() override;
void GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,

Powered by Google App Engine
This is Rietveld 408576698