| OLD | NEW |
| 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 <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 const int render_process_id_; | 172 const int render_process_id_; |
| 173 | 173 |
| 174 // TaskRunner to dispatch all CDM messages to. If it's NULL, all messages are | 174 // TaskRunner to dispatch all CDM messages to. If it's NULL, all messages are |
| 175 // dispatched to the browser UI thread. | 175 // dispatched to the browser UI thread. |
| 176 scoped_refptr<base::TaskRunner> task_runner_; | 176 scoped_refptr<base::TaskRunner> task_runner_; |
| 177 | 177 |
| 178 // The key in the following maps is a combination of |render_frame_id| and | 178 // The key in the following maps is a combination of |render_frame_id| and |
| 179 // |cdm_id|. | 179 // |cdm_id|. |
| 180 | 180 |
| 181 // Map of managed BrowserCdms. | 181 // Map of managed BrowserCdms. |
| 182 typedef base::ScopedPtrHashMap<uint64, media::BrowserCdm> CdmMap; | 182 typedef base::ScopedPtrHashMap<uint64, scoped_ptr<media::BrowserCdm>> CdmMap; |
| 183 CdmMap cdm_map_; | 183 CdmMap cdm_map_; |
| 184 | 184 |
| 185 // Map of CDM's security origin. | 185 // Map of CDM's security origin. |
| 186 std::map<uint64, GURL> cdm_security_origin_map_; | 186 std::map<uint64, GURL> cdm_security_origin_map_; |
| 187 | 187 |
| 188 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_; | 188 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_; |
| 189 | 189 |
| 190 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager); | 190 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager); |
| 191 }; | 191 }; |
| 192 | 192 |
| 193 } // namespace content | 193 } // namespace content |
| 194 | 194 |
| 195 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ | 195 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ |
| OLD | NEW |