diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2013-10-04 16:40:17 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-29 16:37:47 +0200 |
commit | 070846b2efff8c8f2e8bdebef259f411ddeaac1e (patch) | |
tree | 42bb12323a57298bb30b2ebd91be1bed0066b073 /src/core/content_browser_client_qt.cpp | |
parent | 4da1db8fb60b444dc112b41804a3ac7480197bd2 (diff) |
Add WebRTC support
Reuse the MediaCaptureDevicesDispatcher from the chrome layer,
pretty much as is, and wire it in with WebContentsDelegateQt and
WebContentsAdapter/WebContentsAdapterClient for API delegation.
We also need to ensure that our user agent string mentions Chrome and
the Chrome version we're based on, in order to please websites that detect
feature support that way.
Change-Id: I0ddf8cd34e4add96bc36f59adfe8e0384e728d93
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 86ff11efb..8945ad0e5 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -45,6 +45,7 @@ #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_main_parts.h" #include "content/public/browser/child_process_security_policy.h" +#include "content/public/browser/media_observer.h" #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/common/main_function_params.h" #include "content/public/common/url_constants.h" @@ -54,6 +55,7 @@ #include "browser_context_qt.h" #include "dev_tools_http_handler_delegate_qt.h" +#include "media_capture_devices_dispatcher.h" #include "resource_dispatcher_host_delegate_qt.h" #include "web_contents_view_qt.h" @@ -310,6 +312,11 @@ gfx::GLShareGroup *ContentBrowserClientQt::GetInProcessGpuShareGroup() return m_shareGroupQtQuick.get(); } +content::MediaObserver *ContentBrowserClientQt::GetMediaObserver() +{ + return MediaCaptureDevicesDispatcher::GetInstance(); +} + BrowserContextQt* ContentBrowserClientQt::browser_context() { Q_ASSERT(m_browserMainParts); return static_cast<BrowserMainPartsQt*>(m_browserMainParts)->browser_context(); |