diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-23 14:43:14 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-15 18:11:44 +0200 |
| commit | 027e7e574e7a4488d47cd4133e98d518210b1e56 (patch) | |
| tree | c45f05457509b7d99c39a3889119c04c4aee39e3 /src/core/web_contents_delegate_qt.cpp | |
| parent | 2dce0008ce53d27d281ad2dc00eb32d25ae5fc84 (diff) | |
Adaptations for Chromium 88
Change-Id: Ie66e95dbb9fbcafe961bb98d5c277f8c32d66b96
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 773bef8da..e71e78d3c 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -77,7 +77,6 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/frame_navigate_params.h" #include "content/public/common/url_constants.h" #include "net/base/data_url.h" #include "net/base/url_util.h" @@ -867,15 +866,6 @@ void WebContentsDelegateQt::ContentsZoomChange(bool zoom_in) adapter->setZoomFactor(adapter->currentZoomFactor() - 0.1f); } -bool WebContentsDelegateQt::ShouldNavigateOnBackForwardMouseButtons() -{ -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - return false; -#else - return true; -#endif -} - void WebContentsDelegateQt::ResourceLoadComplete(content::RenderFrameHost* render_frame_host, const content::GlobalRequestID& request_id, const blink::mojom::ResourceLoadInfo& resource_load_info) @@ -956,6 +946,7 @@ int &WebContentsDelegateQt::streamCount(blink::mojom::MediaStreamType type) case blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE: case blink::mojom::MediaStreamType::DISPLAY_VIDEO_CAPTURE: case blink::mojom::MediaStreamType::DISPLAY_AUDIO_CAPTURE: + case blink::mojom::MediaStreamType::DISPLAY_VIDEO_CAPTURE_THIS_TAB: return m_desktopStreamCount; case blink::mojom::MediaStreamType::NO_SERVICE: |