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

Unified Diff: media/base/browser_cdm_factory.h

Issue 308073004: Add PlayerTracker and BrowserCdm interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 7 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/base/browser_cdm.cc ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/browser_cdm_factory.h
diff --git a/media/base/cdm_factory.h b/media/base/browser_cdm_factory.h
similarity index 73%
rename from media/base/cdm_factory.h
rename to media/base/browser_cdm_factory.h
index ccdefa72fd38fda93e70c07b47d3594eede37c30..4e86c8ba59e4728eafef82018aa87057fbd5a24f 100644
--- a/media/base/cdm_factory.h
+++ b/media/base/browser_cdm_factory.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_BASE_CDM_FACTORY_H_
-#define MEDIA_BASE_CDM_FACTORY_H_
+#ifndef MEDIA_BASE_BROWSER_CDM_FACTORY_H_
+#define MEDIA_BASE_BROWSER_CDM_FACTORY_H_
#include <string>
@@ -13,9 +13,12 @@
namespace media {
-// Creates a CDM for |key_system|. Returns NULL if the CDM cannot be created.
+class BrowserCdm;
+
+// Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be
+// created.
// TODO(xhwang): Add ifdef for IPC based CDM.
-scoped_ptr<MediaKeys> MEDIA_EXPORT
+scoped_ptr<BrowserCdm> MEDIA_EXPORT
CreateBrowserCdm(const std::string& key_system,
const SessionCreatedCB& session_created_cb,
const SessionMessageCB& session_message_cb,
@@ -25,4 +28,4 @@ scoped_ptr<MediaKeys> MEDIA_EXPORT
} // namespace media
-#endif // MEDIA_BASE_CDM_FACTORY_H_
+#endif // MEDIA_BASE_BROWSER_CDM_FACTORY_H_
« no previous file with comments | « media/base/browser_cdm.cc ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698