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

Side by Side Diff: content/browser/media/cdm/browser_cdm_manager.h

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
6 #define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ 6 #define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 private: 87 private:
88 // Returns the CdmFactory that can be used to create CDMs. Returns null if 88 // Returns the CdmFactory that can be used to create CDMs. Returns null if
89 // CDM is not supported. 89 // CDM is not supported.
90 media::CdmFactory* GetCdmFactory(); 90 media::CdmFactory* GetCdmFactory();
91 91
92 // CDM callbacks. 92 // CDM callbacks.
93 void OnSessionMessage(int render_frame_id, 93 void OnSessionMessage(int render_frame_id,
94 int cdm_id, 94 int cdm_id,
95 const std::string& session_id, 95 const std::string& session_id,
96 media::MediaKeys::MessageType message_type, 96 media::MediaKeys::MessageType message_type,
97 const std::vector<uint8_t>& message, 97 const std::vector<uint8_t>& message);
98 const GURL& legacy_destination_url);
99 void OnSessionClosed(int render_frame_id, 98 void OnSessionClosed(int render_frame_id,
100 int cdm_id, 99 int cdm_id,
101 const std::string& session_id); 100 const std::string& session_id);
102 void OnLegacySessionError(int render_frame_id,
103 int cdm_id,
104 const std::string& session_id,
105 media::MediaKeys::Exception exception_code,
106 uint32_t system_code,
107 const std::string& error_message);
108 void OnSessionKeysChange(int render_frame_id, 101 void OnSessionKeysChange(int render_frame_id,
109 int cdm_id, 102 int cdm_id,
110 const std::string& session_id, 103 const std::string& session_id,
111 bool has_additional_usable_key, 104 bool has_additional_usable_key,
112 media::CdmKeysInfo keys_info); 105 media::CdmKeysInfo keys_info);
113 void OnSessionExpirationUpdate(int render_frame_id, 106 void OnSessionExpirationUpdate(int render_frame_id,
114 int cdm_id, 107 int cdm_id,
115 const std::string& session_id, 108 const std::string& session_id,
116 const base::Time& new_expiry_time); 109 const base::Time& new_expiry_time);
117 110
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 std::map<uint64_t, GURL> cdm_security_origin_map_; 209 std::map<uint64_t, GURL> cdm_security_origin_map_;
217 210
218 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_; 211 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
219 212
220 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager); 213 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager);
221 }; 214 };
222 215
223 } // namespace content 216 } // namespace content
224 217
225 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ 218 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698