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

Side by Side Diff: media/cdm/proxy_decryptor.h

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ScopedVector Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CDM_PROXY_DECRYPTOR_H_ 5 #ifndef MEDIA_CDM_PROXY_DECRYPTOR_H_
6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_ 6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 scoped_ptr<MediaKeys> CreateMediaKeys( 68 scoped_ptr<MediaKeys> CreateMediaKeys(
69 CdmFactory* cdm_factory, 69 CdmFactory* cdm_factory,
70 const std::string& key_system, 70 const std::string& key_system,
71 const GURL& security_origin); 71 const GURL& security_origin);
72 72
73 // Callbacks for firing session events. 73 // Callbacks for firing session events.
74 void OnSessionMessage(const std::string& web_session_id, 74 void OnSessionMessage(const std::string& web_session_id,
75 const std::vector<uint8>& message, 75 const std::vector<uint8>& message,
76 const GURL& default_url); 76 const GURL& default_url);
77 void OnSessionKeysChange(const std::string& web_session_id, 77 void OnSessionKeysChange(const std::string& web_session_id,
78 bool has_additional_usable_key); 78 bool has_additional_usable_key,
79 const CdmKeysInfo& keys_info);
79 void OnSessionExpirationUpdate(const std::string& web_session_id, 80 void OnSessionExpirationUpdate(const std::string& web_session_id,
80 const base::Time& new_expiry_time); 81 const base::Time& new_expiry_time);
81 void GenerateKeyAdded(const std::string& web_session_id); 82 void GenerateKeyAdded(const std::string& web_session_id);
82 void OnSessionClosed(const std::string& web_session_id); 83 void OnSessionClosed(const std::string& web_session_id);
83 void OnSessionError(const std::string& web_session_id, 84 void OnSessionError(const std::string& web_session_id,
84 MediaKeys::Exception exception_code, 85 MediaKeys::Exception exception_code,
85 uint32 system_code, 86 uint32 system_code,
86 const std::string& error_message); 87 const std::string& error_message);
87 88
88 enum SessionCreationType { 89 enum SessionCreationType {
(...skipping 21 matching lines...) Expand all
110 111
111 // NOTE: Weak pointers must be invalidated before all other member variables. 112 // NOTE: Weak pointers must be invalidated before all other member variables.
112 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_; 113 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
113 114
114 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor); 115 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
115 }; 116 };
116 117
117 } // namespace media 118 } // namespace media
118 119
119 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_ 120 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698