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

Side by Side Diff: content/renderer/media/cdm/pepper_cdm_wrapper.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 | « content/renderer/BUILD.gn ('k') | content/renderer/media/cdm/pepper_cdm_wrapper_impl.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 CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_H_
6 #define CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_H_ 6 #define CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_H_
7 7
8 #include "ppapi/features/features.h" 8 #if !defined(ENABLE_PEPPER_CDMS)
9
10 #if !BUILDFLAG(ENABLE_PEPPER_CDMS)
11 #error This file should only be included when ENABLE_PEPPER_CDMS is defined 9 #error This file should only be included when ENABLE_PEPPER_CDMS is defined
12 #endif 10 #endif
13 11
14 #include <memory> 12 #include <memory>
15 #include <string> 13 #include <string>
16 14
17 #include "base/callback.h" 15 #include "base/callback.h"
18 #include "base/macros.h" 16 #include "base/macros.h"
19 17
20 class GURL; 18 class GURL;
(...skipping 19 matching lines...) Expand all
40 // Callback used to create a PepperCdmWrapper. This may return null if the 38 // Callback used to create a PepperCdmWrapper. This may return null if the
41 // Pepper CDM can not be created. 39 // Pepper CDM can not be created.
42 typedef base::Callback<std::unique_ptr<PepperCdmWrapper>( 40 typedef base::Callback<std::unique_ptr<PepperCdmWrapper>(
43 const std::string& pluginType, 41 const std::string& pluginType,
44 const GURL& security_origin)> 42 const GURL& security_origin)>
45 CreatePepperCdmCB; 43 CreatePepperCdmCB;
46 44
47 } // namespace content 45 } // namespace content
48 46
49 #endif // CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_H_ 47 #endif // CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_H_
OLDNEW
« no previous file with comments | « content/renderer/BUILD.gn ('k') | content/renderer/media/cdm/pepper_cdm_wrapper_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698