Fix the build with enable_webrtc=0 after r281588.

CanUseCompositorAPI() and CanUseVideoDecodeAPI() were defined only if WebRTC support was enabled, even though they do not depend on it.
    
Make the ENABLE_WEBRTC ifdef cover only CanUseMediaStreamAPI() instead.

BUG=386743
R=teravest@chromium.org, dmichael@chromium.org

Review URL: https://codereview.chromium.org/390763003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283512 0039d316-1c4b-4281-b951-d872f2087c98
parent 189f6b3a
...@@ -39,9 +39,9 @@ using ppapi::UnpackMessage; ...@@ -39,9 +39,9 @@ using ppapi::UnpackMessage;
namespace content { namespace content {
#if defined(ENABLE_WEBRTC)
namespace { namespace {
#if defined(ENABLE_WEBRTC)
bool CanUseMediaStreamAPI(const RendererPpapiHost* host, PP_Instance instance) { bool CanUseMediaStreamAPI(const RendererPpapiHost* host, PP_Instance instance) {
blink::WebPluginContainer* container = blink::WebPluginContainer* container =
host->GetContainerForInstance(instance); host->GetContainerForInstance(instance);
...@@ -53,6 +53,7 @@ bool CanUseMediaStreamAPI(const RendererPpapiHost* host, PP_Instance instance) { ...@@ -53,6 +53,7 @@ bool CanUseMediaStreamAPI(const RendererPpapiHost* host, PP_Instance instance) {
GetContentClient()->renderer(); GetContentClient()->renderer();
return content_renderer_client->AllowPepperMediaStreamAPI(document_url); return content_renderer_client->AllowPepperMediaStreamAPI(document_url);
} }
#endif // defined(ENABLE_WEBRTC)
bool CanUseCompositorAPI(const RendererPpapiHost* host, PP_Instance instance) { bool CanUseCompositorAPI(const RendererPpapiHost* host, PP_Instance instance) {
blink::WebPluginContainer* container = blink::WebPluginContainer* container =
...@@ -81,7 +82,6 @@ bool CanUseVideoDecodeAPI(const RendererPpapiHost* host, PP_Instance instance) { ...@@ -81,7 +82,6 @@ bool CanUseVideoDecodeAPI(const RendererPpapiHost* host, PP_Instance instance) {
} }
} // namespace } // namespace
#endif // defined(ENABLE_WEBRTC)
ContentRendererPepperHostFactory::ContentRendererPepperHostFactory( ContentRendererPepperHostFactory::ContentRendererPepperHostFactory(
RendererPpapiHostImpl* host) RendererPpapiHostImpl* host)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment