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

Unified Diff: content/renderer/media/cdm/render_cdm_factory.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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/cdm/render_cdm_factory.h
diff --git a/content/renderer/media/cdm/render_cdm_factory.h b/content/renderer/media/cdm/render_cdm_factory.h
index 1a9f361a8ea06f6243b83e1f01a9c42b88b10416..1b03c4017a6b8baba9e79b35d8f68134f711059c 100644
--- a/content/renderer/media/cdm/render_cdm_factory.h
+++ b/content/renderer/media/cdm/render_cdm_factory.h
@@ -12,9 +12,8 @@
#include "base/threading/thread_checker.h"
#include "media/base/cdm_factory.h"
#include "media/base/media_keys.h"
-#include "ppapi/features/features.h"
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
#include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
#endif
@@ -30,11 +29,11 @@
// and should only be used on one thread.
class RenderCdmFactory : public media::CdmFactory {
public:
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
explicit RenderCdmFactory(const CreatePepperCdmCB& create_pepper_cdm_cb);
#else
RenderCdmFactory();
-#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
+#endif // defined(ENABLE_PEPPER_CDMS)
~RenderCdmFactory() override;
@@ -50,7 +49,7 @@
const media::CdmCreatedCB& cdm_created_cb) override;
private:
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
CreatePepperCdmCB create_pepper_cdm_cb_;
#endif
« no previous file with comments | « content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc ('k') | content/renderer/media/cdm/render_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698