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

Side by Side Diff: content/renderer/media/cdm_session_adapter.h

Issue 665563002: Add MediaKeys::GetCdmId(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Make GetCdmId() pure virtual. Created 6 years, 2 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_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_
6 #define CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_ 6 #define CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 const std::string& error_message); 130 const std::string& error_message);
131 131
132 // Helper function of the callbacks. 132 // Helper function of the callbacks.
133 WebContentDecryptionModuleSessionImpl* GetSession( 133 WebContentDecryptionModuleSessionImpl* GetSession(
134 const std::string& web_session_id); 134 const std::string& web_session_id);
135 135
136 scoped_ptr<media::MediaKeys> media_keys_; 136 scoped_ptr<media::MediaKeys> media_keys_;
137 137
138 SessionMap sessions_; 138 SessionMap sessions_;
139 139
140 #if defined(ENABLE_BROWSER_CDMS)
141 int cdm_id_;
142 #endif
143
144 std::string key_system_uma_prefix_; 140 std::string key_system_uma_prefix_;
145 141
146 // NOTE: Weak pointers must be invalidated before all other member variables. 142 // NOTE: Weak pointers must be invalidated before all other member variables.
147 base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_; 143 base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
148 144
149 DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter); 145 DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);
150 }; 146 };
151 147
152 } // namespace content 148 } // namespace content
153 149
154 #endif // CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_ 150 #endif // CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/cdm_session_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698