diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-31 18:40:01 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-01 09:27:36 +0000 |
| commit | 26d7e8597239035a2b57c73c92743dcdeffa9368 (patch) | |
| tree | 888d3d1253ce9fdebc3c2436707dcb6b88a5d439 | |
| parent | f500275e774945c8c19dc3e763510f04bca52261 (diff) | |
| download | qtwebengine-chromium-26d7e8597239035a2b57c73c92743dcdeffa9368.tar.gz | |
FIXUP: Fix build with plugins enabled and webrtc disabled
Also fix linking error, and turn it into a compiler error in the future.
Change-Id: Ic6841eb70b40bd894495036d9d8d5a0a78fcf2b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@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 99f2c3fb7f7..19ff8c2e02e 100644 --- a/chromium/content/renderer/pepper/pepper_media_device_manager.cc +++ b/chromium/content/renderer/pepper/pepper_media_device_manager.cc @@ -12,13 +12,16 @@ #include "base/threading/thread_task_runner_handle.h" #include "content/public/common/console_message_level.h" #include "content/public/common/content_features.h" -#include "content/renderer/media/stream/media_stream_device_observer.h" #include "content/renderer/pepper/renderer_ppapi_host_impl.h" #include "content/renderer/render_frame_impl.h" #include "media/media_buildflags.h" #include "ppapi/shared_impl/ppb_device_ref_shared.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 { @@ -267,8 +270,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); |