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

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

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more trybot issue Created 6 years, 6 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 15 matching lines...) Expand all
26 // callbacks can be called asynchronously. 26 // callbacks can be called asynchronously.
27 static scoped_ptr<media::MediaKeys> Create( 27 static scoped_ptr<media::MediaKeys> Create(
28 const std::string& key_system, 28 const std::string& key_system,
29 const GURL& security_origin, 29 const GURL& security_origin,
30 #if defined(ENABLE_PEPPER_CDMS) 30 #if defined(ENABLE_PEPPER_CDMS)
31 const CreatePepperCdmCB& create_pepper_cdm_cb, 31 const CreatePepperCdmCB& create_pepper_cdm_cb,
32 #elif defined(OS_ANDROID) 32 #elif defined(OS_ANDROID)
33 RendererCdmManager* manager, 33 RendererCdmManager* manager,
34 int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys. 34 int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys.
35 #endif // defined(ENABLE_PEPPER_CDMS) 35 #endif // defined(ENABLE_PEPPER_CDMS)
36 const media::SessionCreatedCB& session_created_cb,
37 const media::SessionMessageCB& session_message_cb, 36 const media::SessionMessageCB& session_message_cb,
38 const media::SessionReadyCB& session_ready_cb, 37 const media::SessionReadyCB& session_ready_cb,
39 const media::SessionClosedCB& session_closed_cb, 38 const media::SessionClosedCB& session_closed_cb,
40 const media::SessionErrorCB& session_error_cb); 39 const media::SessionErrorCB& session_error_cb);
41 }; 40 };
42 41
43 } // namespace content 42 } // namespace content
44 43
45 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ 44 #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