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

Side by Side Diff: chromecast/browser/media/cast_browser_cdm_factory.h

Issue 861153004: Chromecast buildfix: updates BrowserCdmFactory for new API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | chromecast/browser/media/cast_browser_cdm_factory.cc » ('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 CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_ 5 #ifndef CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_
6 #define CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_ 6 #define CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_
7 7
8 #include "chromecast/media/base/key_systems_common.h" 8 #include "chromecast/media/base/key_systems_common.h"
9 #include "media/base/browser_cdm.h" 9 #include "media/base/browser_cdm.h"
10 #include "media/base/browser_cdm_factory.h" 10 #include "media/base/browser_cdm_factory.h"
11 11
12 namespace chromecast { 12 namespace chromecast {
13 namespace media { 13 namespace media {
14 14
15 class CastBrowserCdmFactory : public ::media::BrowserCdmFactory { 15 class CastBrowserCdmFactory : public ::media::BrowserCdmFactory {
16 public: 16 public:
17 CastBrowserCdmFactory() {} 17 CastBrowserCdmFactory() {}
18 ~CastBrowserCdmFactory() override {}; 18 ~CastBrowserCdmFactory() override {};
19 19
20 // ::media::BrowserCdmFactory implementation: 20 // ::media::BrowserCdmFactory implementation:
21 scoped_ptr< ::media::BrowserCdm> CreateBrowserCdm( 21 scoped_ptr< ::media::BrowserCdm> CreateBrowserCdm(
22 const std::string& key_system, 22 const std::string& key_system,
23 const ::media::BrowserCdm::SessionCreatedCB& session_created_cb, 23 const ::media::SessionMessageCB& session_message_cb,
24 const ::media::BrowserCdm::SessionMessageCB& session_message_cb, 24 const ::media::SessionClosedCB& session_closed_cb,
25 const ::media::BrowserCdm::SessionReadyCB& session_ready_cb, 25 const ::media::SessionErrorCB& session_error_cb,
26 const ::media::BrowserCdm::SessionClosedCB& session_closed_cb, 26 const ::media::SessionKeysChangeCB& session_keys_change_cb,
27 const ::media::BrowserCdm::SessionErrorCB& session_error_cb) override; 27 const ::media::SessionExpirationUpdateCB&
28 session_expiration_update_cb) override;
28 29
29 private: 30 private:
30 DISALLOW_COPY_AND_ASSIGN(CastBrowserCdmFactory); 31 DISALLOW_COPY_AND_ASSIGN(CastBrowserCdmFactory);
31 }; 32 };
32 33
33 // Allow platform-specific CDMs to be provided. 34 // Allow platform-specific CDMs to be provided.
34 scoped_ptr< ::media::BrowserCdm> CreatePlatformBrowserCdm( 35 scoped_ptr< ::media::BrowserCdm> CreatePlatformBrowserCdm(
35 const CastKeySystem& key_system, 36 const CastKeySystem& key_system,
36 const ::media::BrowserCdm::SessionCreatedCB& session_created_cb, 37 const ::media::SessionMessageCB& session_message_cb,
37 const ::media::BrowserCdm::SessionMessageCB& session_message_cb, 38 const ::media::SessionClosedCB& session_closed_cb,
38 const ::media::BrowserCdm::SessionReadyCB& session_ready_cb, 39 const ::media::SessionErrorCB& session_error_cb,
39 const ::media::BrowserCdm::SessionClosedCB& session_closed_cb, 40 const ::media::SessionKeysChangeCB& session_keys_change_cb,
40 const ::media::BrowserCdm::SessionErrorCB& session_error_cb); 41 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb);
41 42
42 } // namespace media 43 } // namespace media
43 } // namespace chromecast 44 } // namespace chromecast
44 45
45 #endif // CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_ 46 #endif // CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | chromecast/browser/media/cast_browser_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698