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

Side by Side Diff: content/renderer/media/crypto/ppapi_decryptor.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. Created 5 years, 7 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 CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 30
31 // PpapiDecryptor implements media::MediaKeys and media::Decryptor and forwards 31 // PpapiDecryptor implements media::MediaKeys and media::Decryptor and forwards
32 // all calls to the PluginInstance. 32 // all calls to the PluginInstance.
33 // This class should always be created & destroyed on the main renderer thread. 33 // This class should always be created & destroyed on the main renderer thread.
34 class PpapiDecryptor : public media::MediaKeys, 34 class PpapiDecryptor : public media::MediaKeys,
35 public media::CdmContext, 35 public media::CdmContext,
36 public media::Decryptor { 36 public media::Decryptor {
37 public: 37 public:
38 static void Create( 38 static void Create(
39 const std::string& key_system, 39 const std::string& key_system,
40 const GURL& security_origin,
40 bool allow_distinctive_identifier, 41 bool allow_distinctive_identifier,
41 bool allow_persistent_state, 42 bool allow_persistent_state,
42 const GURL& security_origin,
43 const CreatePepperCdmCB& create_pepper_cdm_cb, 43 const CreatePepperCdmCB& create_pepper_cdm_cb,
44 const media::SessionMessageCB& session_message_cb, 44 const media::SessionMessageCB& session_message_cb,
45 const media::SessionClosedCB& session_closed_cb, 45 const media::SessionClosedCB& session_closed_cb,
46 const media::LegacySessionErrorCB& legacy_session_error_cb, 46 const media::LegacySessionErrorCB& legacy_session_error_cb,
47 const media::SessionKeysChangeCB& session_keys_change_cb, 47 const media::SessionKeysChangeCB& session_keys_change_cb,
48 const media::SessionExpirationUpdateCB& session_expiration_update_cb, 48 const media::SessionExpirationUpdateCB& session_expiration_update_cb,
49 const media::CdmCreatedCB& cdm_created_cb); 49 const media::CdmCreatedCB& cdm_created_cb);
50 50
51 ~PpapiDecryptor() override; 51 ~PpapiDecryptor() override;
52 52
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 // NOTE: Weak pointers must be invalidated before all other member variables. 157 // NOTE: Weak pointers must be invalidated before all other member variables.
158 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 158 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
159 159
160 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 160 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
161 }; 161 };
162 162
163 } // namespace content 163 } // namespace content
164 164
165 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 165 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698