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

Side by Side Diff: content/renderer/media/cdm/render_cdm_factory.h

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 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_CDM_RENDER_CDM_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 ~RenderCdmFactory() override; 44 ~RenderCdmFactory() override;
45 45
46 // CdmFactory implementation. 46 // CdmFactory implementation.
47 void Create( 47 void Create(
48 const std::string& key_system, 48 const std::string& key_system,
49 const GURL& security_origin, 49 const GURL& security_origin,
50 const media::CdmConfig& cdm_config, 50 const media::CdmConfig& cdm_config,
51 const media::SessionMessageCB& session_message_cb, 51 const media::SessionMessageCB& session_message_cb,
52 const media::SessionClosedCB& session_closed_cb, 52 const media::SessionClosedCB& session_closed_cb,
53 const media::LegacySessionErrorCB& legacy_session_error_cb,
54 const media::SessionKeysChangeCB& session_keys_change_cb, 53 const media::SessionKeysChangeCB& session_keys_change_cb,
55 const media::SessionExpirationUpdateCB& session_expiration_update_cb, 54 const media::SessionExpirationUpdateCB& session_expiration_update_cb,
56 const media::CdmCreatedCB& cdm_created_cb) override; 55 const media::CdmCreatedCB& cdm_created_cb) override;
57 56
58 private: 57 private:
59 #if defined(ENABLE_PEPPER_CDMS) 58 #if defined(ENABLE_PEPPER_CDMS)
60 CreatePepperCdmCB create_pepper_cdm_cb_; 59 CreatePepperCdmCB create_pepper_cdm_cb_;
61 #elif defined(ENABLE_BROWSER_CDMS) 60 #elif defined(ENABLE_BROWSER_CDMS)
62 // The |manager_| is a per render frame object owned by RenderFrameImpl. 61 // The |manager_| is a per render frame object owned by RenderFrameImpl.
63 RendererCdmManager* manager_; 62 RendererCdmManager* manager_;
64 #endif 63 #endif
65 64
66 base::ThreadChecker thread_checker_; 65 base::ThreadChecker thread_checker_;
67 66
68 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory); 67 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory);
69 }; 68 };
70 69
71 } // namespace content 70 } // namespace content
72 71
73 #endif // CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_ 72 #endif // CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698