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

Unified Diff: media/cdm/proxy_decryptor.h

Issue 1001723002: media: Refactor PlatformVerificationFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 9 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 | « chrome/browser/prefs/browser_prefs.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/proxy_decryptor.h
diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h
index c8e05d74ad2c90b42c44753eeded1ceef50af246..e3a3fe4304debda3a808f9521f071761212d3a80 100644
--- a/media/cdm/proxy_decryptor.h
+++ b/media/cdm/proxy_decryptor.h
@@ -15,8 +15,7 @@
#include "media/base/decryptor.h"
#include "media/base/media_export.h"
#include "media/base/media_keys.h"
-
-class GURL;
+#include "url/gurl.h"
namespace media {
@@ -89,6 +88,13 @@ class MEDIA_EXPORT ProxyDecryptor {
uint32 system_code,
const std::string& error_message);
+ // Callback for permission request.
+ void OnPermissionStatus(MediaKeys::SessionType session_type,
+ const std::string& init_data_type,
+ const std::vector<uint8>& init_data,
+ scoped_ptr<NewSessionCdmPromise> promise,
+ bool granted);
+
enum SessionCreationType {
TemporarySession,
PersistentSession,
@@ -102,11 +108,16 @@ class MEDIA_EXPORT ProxyDecryptor {
// The real MediaKeys that manages key operations for the ProxyDecryptor.
scoped_ptr<MediaKeys> media_keys_;
+ MediaPermission* media_permission_;
+
// Callbacks for firing key events.
KeyAddedCB key_added_cb_;
KeyErrorCB key_error_cb_;
KeyMessageCB key_message_cb_;
+ std::string key_system_;
+ GURL security_origin_;
+
// Keep track of both persistent and non-persistent sessions.
base::hash_map<std::string, bool> active_sessions_;
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698