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

Side by Side Diff: content/renderer/media/cdm/pepper_cdm_wrapper_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
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_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_IMPL_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 13
16 #include "base/callback.h" 14 #include "base/callback.h"
17 #include "base/macros.h" 15 #include "base/macros.h"
18 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
19 #include "content/renderer/media/cdm/pepper_cdm_wrapper.h" 17 #include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
20 18
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 62
65 ScopedHelperPlugin helper_plugin_; 63 ScopedHelperPlugin helper_plugin_;
66 scoped_refptr<PepperPluginInstanceImpl> plugin_instance_; 64 scoped_refptr<PepperPluginInstanceImpl> plugin_instance_;
67 65
68 DISALLOW_COPY_AND_ASSIGN(PepperCdmWrapperImpl); 66 DISALLOW_COPY_AND_ASSIGN(PepperCdmWrapperImpl);
69 }; 67 };
70 68
71 } // namespace content 69 } // namespace content
72 70
73 #endif // CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_IMPL_H_ 71 #endif // CONTENT_RENDERER_MEDIA_CDM_PEPPER_CDM_WRAPPER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/cdm/pepper_cdm_wrapper.h ('k') | content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698