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

Side by Side 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: reformat other instance 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 unified diff | Download patch
« no previous file with comments | « content/renderer/media/crypto/encrypted_media_player_support_impl.cc ('k') | no next file » | 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1689 matching lines...) Expand 10 before | Expand all | Expand 10 after
1700 #endif // defined(OS_ANDROID) 1700 #endif // defined(OS_ANDROID)
1701 } 1701 }
1702 1702
1703 blink::WebContentDecryptionModule* 1703 blink::WebContentDecryptionModule*
1704 RenderFrameImpl::createContentDecryptionModule( 1704 RenderFrameImpl::createContentDecryptionModule(
1705 blink::WebLocalFrame* frame, 1705 blink::WebLocalFrame* frame,
1706 const blink::WebSecurityOrigin& security_origin, 1706 const blink::WebSecurityOrigin& security_origin,
1707 const blink::WebString& key_system) { 1707 const blink::WebString& key_system) {
1708 DCHECK(!frame_ || frame_ == frame); 1708 DCHECK(!frame_ || frame_ == frame);
1709 1709
1710 #if defined(ENABLE_PEPPER_CDMS)
1710 RenderCdmFactory cdm_factory( 1711 RenderCdmFactory cdm_factory(
1711 #if defined(ENABLE_PEPPER_CDMS) 1712 base::Bind(&PepperCdmWrapperImpl::Create, frame));
1712 base::Bind(&PepperCdmWrapperImpl::Create, frame)
1713 #elif defined(ENABLE_BROWSER_CDMS) 1713 #elif defined(ENABLE_BROWSER_CDMS)
1714 GetCdmManager() 1714 RenderCdmFactory cdm_factory(GetCdmManager());
1715 #else
1716 RenderCdmFactory cdm_factory;
1715 #endif 1717 #endif
1716 );
1717 1718
1718 return WebContentDecryptionModuleImpl::Create(&cdm_factory, security_origin, 1719 return WebContentDecryptionModuleImpl::Create(&cdm_factory, security_origin,
1719 key_system); 1720 key_system);
1720 } 1721 }
1721 1722
1722 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 1723 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
1723 blink::WebLocalFrame* frame, 1724 blink::WebLocalFrame* frame,
1724 blink::WebApplicationCacheHostClient* client) { 1725 blink::WebApplicationCacheHostClient* client) {
1725 if (!frame || !frame->view()) 1726 if (!frame || !frame->view())
1726 return NULL; 1727 return NULL;
(...skipping 2385 matching lines...) Expand 10 before | Expand all | Expand 10 after
4112 4113
4113 #if defined(ENABLE_BROWSER_CDMS) 4114 #if defined(ENABLE_BROWSER_CDMS)
4114 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4115 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4115 if (!cdm_manager_) 4116 if (!cdm_manager_)
4116 cdm_manager_ = new RendererCdmManager(this); 4117 cdm_manager_ = new RendererCdmManager(this);
4117 return cdm_manager_; 4118 return cdm_manager_;
4118 } 4119 }
4119 #endif // defined(ENABLE_BROWSER_CDMS) 4120 #endif // defined(ENABLE_BROWSER_CDMS)
4120 4121
4121 } // namespace content 4122 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/encrypted_media_player_support_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698