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

Side by Side Diff: media/blink/webcontentdecryptionmodule_impl.h

Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Created 4 years, 2 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/blink/BUILD.gn ('k') | media/cdm/aes_decryptor_unittest.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 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 MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "media/blink/media_blink_export.h" 16 #include "media/blink/media_blink_export.h"
17 #include "ppapi/features/features.h"
18 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" 17 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
19 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" 18 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
20 19
21 namespace blink { 20 namespace blink {
22 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 21 #if defined(ENABLE_PEPPER_CDMS)
23 class WebLocalFrame; 22 class WebLocalFrame;
24 #endif 23 #endif
25 class WebSecurityOrigin; 24 class WebSecurityOrigin;
26 } 25 }
27 26
28 namespace media { 27 namespace media {
29 28
30 struct CdmConfig; 29 struct CdmConfig;
31 class CdmFactory; 30 class CdmFactory;
32 class CdmSessionAdapter; 31 class CdmSessionAdapter;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 68
70 // Allow typecasting from blink type as this is the only implementation. 69 // Allow typecasting from blink type as this is the only implementation.
71 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl( 70 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
72 blink::WebContentDecryptionModule* cdm) { 71 blink::WebContentDecryptionModule* cdm) {
73 return static_cast<WebContentDecryptionModuleImpl*>(cdm); 72 return static_cast<WebContentDecryptionModuleImpl*>(cdm);
74 } 73 }
75 74
76 } // namespace media 75 } // namespace media
77 76
78 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 77 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/BUILD.gn ('k') | media/cdm/aes_decryptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698