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

Side by Side Diff: media/base/browser_cdm_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
« no previous file with comments | « media/base/browser_cdm.h ('k') | media/base/cdm_promise.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_BROWSER_CDM_FACTORY_H_ 5 #ifndef MEDIA_BASE_BROWSER_CDM_FACTORY_H_
6 #define MEDIA_BASE_BROWSER_CDM_FACTORY_H_ 6 #define MEDIA_BASE_BROWSER_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/browser_cdm.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 class BrowserCdm;
17
18 // Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be 16 // Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be
19 // created. 17 // created.
20 // TODO(xhwang): Add ifdef for IPC based CDM. 18 // TODO(xhwang): Add ifdef for IPC based CDM.
21 scoped_ptr<BrowserCdm> MEDIA_EXPORT 19 scoped_ptr<BrowserCdm> MEDIA_EXPORT
22 CreateBrowserCdm(const std::string& key_system, 20 CreateBrowserCdm(const std::string& key_system,
23 const SessionCreatedCB& session_created_cb, 21 const BrowserCdm::SessionCreatedCB& session_created_cb,
24 const SessionMessageCB& session_message_cb, 22 const BrowserCdm::SessionMessageCB& session_message_cb,
25 const SessionReadyCB& session_ready_cb, 23 const BrowserCdm::SessionReadyCB& session_ready_cb,
26 const SessionClosedCB& session_closed_cb, 24 const BrowserCdm::SessionClosedCB& session_closed_cb,
27 const SessionErrorCB& session_error_cb); 25 const BrowserCdm::SessionErrorCB& session_error_cb);
28 26
29 } // namespace media 27 } // namespace media
30 28
31 #endif // MEDIA_BASE_BROWSER_CDM_FACTORY_H_ 29 #endif // MEDIA_BASE_BROWSER_CDM_FACTORY_H_
OLDNEW
« no previous file with comments | « media/base/browser_cdm.h ('k') | media/base/cdm_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698