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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 650853003: Buildfix for no-args cases to RenderCdmFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleaner ifdefs in RenderFrameImpl Created 6 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/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 02ab8bbda5389f97168c41e0b97424369098af21..d92475a19827899ab7c8265926c04b61fa9aacce 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1707,13 +1707,14 @@ RenderFrameImpl::createContentDecryptionModule(
const blink::WebString& key_system) {
DCHECK(!frame_ || frame_ == frame);
- RenderCdmFactory cdm_factory(
#if defined(ENABLE_PEPPER_CDMS)
- base::Bind(&PepperCdmWrapperImpl::Create, frame)
+ RenderCdmFactory cdm_factory(
+ base::Bind(&PepperCdmWrapperImpl::Create, frame));
#elif defined(ENABLE_BROWSER_CDMS)
- GetCdmManager()
+ RenderCdmFactory cdm_factory(GetCdmManager());
+#else
+ RenderCdmFactory cdm_factory;
#endif
- );
return WebContentDecryptionModuleImpl::Create(&cdm_factory, security_origin,
key_system);

Powered by Google App Engine
This is Rietveld 408576698