From 9f4aba186947a505293d2414e40a5080a2c52861 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 9 Nov 2018 12:57:43 +0100 Subject: FIXUP: Building with plugins but webrtc disabled Fixes: QTBUG-71295 Change-Id: Ia15d1ef8c7d84c53dcd52876e08fb8a480212c76 Reviewed-by: Michal Klocek --- chromium/content/renderer/pepper/pepper_media_device_manager.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/chromium/content/renderer/pepper/pepper_media_device_manager.cc b/chromium/content/renderer/pepper/pepper_media_device_manager.cc index db0bd30b6c5..32ba822468b 100644 --- a/chromium/content/renderer/pepper/pepper_media_device_manager.cc +++ b/chromium/content/renderer/pepper/pepper_media_device_manager.cc @@ -14,7 +14,6 @@ #include "content/public/common/content_features.h" #include "content/public/common/service_names.mojom.h" #include "content/renderer/media/media_devices_event_dispatcher.h" -#include "content/renderer/media/media_stream_device_observer.h" #include "content/renderer/pepper/renderer_ppapi_host_impl.h" #include "content/renderer/render_frame_impl.h" #include "media/media_features.h" @@ -22,6 +21,10 @@ #include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/interface_provider.h" +#if BUILDFLAG(ENABLE_WEBRTC) +#include "content/renderer/media/stream/media_stream_device_observer.h" +#endif + namespace content { namespace { @@ -235,8 +238,10 @@ void PepperMediaDeviceManager::OnDeviceOpened(int request_id, return; } +#if BUILDFLAG(ENABLE_WEBRTC) if (success) GetMediaStreamDeviceObserver()->AddStream(label, device); +#endif OpenDeviceCallback callback = iter->second; open_callbacks_.erase(iter); -- cgit v1.2.3