diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-09 12:57:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-13 11:31:23 +0000 |
| commit | 9f4aba186947a505293d2414e40a5080a2c52861 (patch) | |
| tree | 1c92d8a16b0eedea227312f221a8eb6c171a6a25 | |
| parent | 33fd7a21ed794e4d89062b9153ff714e642773ff (diff) | |
FIXUP: Building with plugins but webrtc disabled
Fixes: QTBUG-71295
Change-Id: Ia15d1ef8c7d84c53dcd52876e08fb8a480212c76
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/content/renderer/pepper/pepper_media_device_manager.cc | 7 |
1 files changed, 6 insertions, 1 deletions
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); |