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

Side by Side Diff: media/base/cdm_factory.h

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android changes 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 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 MEDIA_BASE_CDM_FACTORY_H_ 5 #ifndef MEDIA_BASE_CDM_FACTORY_H_
6 #define MEDIA_BASE_CDM_FACTORY_H_ 6 #define MEDIA_BASE_CDM_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"
11 #include "media/base/android/media_drm_bridge.h"
11 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
12 #include "media/base/media_keys.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 // Creates a CDM for |key_system|. Returns NULL if the CDM cannot be created. 16 // Creates a CDM for |key_system|. Returns NULL if the CDM cannot be created.
17 // TODO(xhwang): Add ifdef for IPC based CDM. 17 // TODO(xhwang): Add ifdef for IPC based CDM.
18 scoped_ptr<MediaKeys> MEDIA_EXPORT 18 scoped_ptr<MediaDrmBridge> MEDIA_EXPORT
19 CreateBrowserCdm(const std::string& key_system, 19 CreateBrowserCdm(const std::string& key_system,
20 const SessionCreatedCB& session_created_cb, 20 const MediaDrmBridge::SessionCreatedCB& session_created_cb,
21 const SessionMessageCB& session_message_cb, 21 const MediaDrmBridge::SessionMessageCB& session_message_cb,
22 const SessionReadyCB& session_ready_cb, 22 const MediaDrmBridge::SessionReadyCB& session_ready_cb,
23 const SessionClosedCB& session_closed_cb, 23 const MediaDrmBridge::SessionClosedCB& session_closed_cb,
24 const SessionErrorCB& session_error_cb); 24 const MediaDrmBridge::SessionErrorCB& session_error_cb);
25 25
26 } // namespace media 26 } // namespace media
27 27
28 #endif // MEDIA_BASE_CDM_FACTORY_H_ 28 #endif // MEDIA_BASE_CDM_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698