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

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

Issue 555223004: Update MediaKeys interface for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments 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 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_CONTENT_DECRYPTION_MODULE_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 20 matching lines...) Expand all
31 const GURL& security_origin, 31 const GURL& security_origin,
32 #if defined(ENABLE_PEPPER_CDMS) 32 #if defined(ENABLE_PEPPER_CDMS)
33 const CreatePepperCdmCB& create_pepper_cdm_cb, 33 const CreatePepperCdmCB& create_pepper_cdm_cb,
34 #elif defined(ENABLE_BROWSER_CDMS) 34 #elif defined(ENABLE_BROWSER_CDMS)
35 RendererCdmManager* manager, 35 RendererCdmManager* manager,
36 int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys. 36 int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys.
37 #endif // defined(ENABLE_PEPPER_CDMS) 37 #endif // defined(ENABLE_PEPPER_CDMS)
38 const media::SessionMessageCB& session_message_cb, 38 const media::SessionMessageCB& session_message_cb,
39 const media::SessionReadyCB& session_ready_cb, 39 const media::SessionReadyCB& session_ready_cb,
40 const media::SessionClosedCB& session_closed_cb, 40 const media::SessionClosedCB& session_closed_cb,
41 const media::SessionErrorCB& session_error_cb); 41 const media::SessionErrorCB& session_error_cb,
42 const media::SessionKeysChangeCB& session_keys_change_cb,
43 const media::SessionExpirationUpdateCB& session_expiration_update_cb);
42 }; 44 };
43 45
44 } // namespace content 46 } // namespace content
45 47
46 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ 48 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
OLDNEW
« no previous file with comments | « content/renderer/media/cdm_session_adapter.cc ('k') | content/renderer/media/crypto/content_decryption_module_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698