diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-10 13:57:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 15:19:10 +0200 |
| commit | 455619d3875e0e0e7a03734806d61c7998735cd4 (patch) | |
| tree | 3e2558da4525819ad9bd5e46ee9f471c73aa8d5f /src/core/type_conversion.h | |
| parent | cd61343ceb4a3de8ce16082917a2f197b2481d08 (diff) | |
Adaptations for Chromium 83
Change-Id: I63ed851426b18623d549ceaf87f1b6eeec527966
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/type_conversion.h')
| -rw-r--r-- | src/core/type_conversion.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index 2275ae82e..83a499284 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -55,6 +55,7 @@ #include "content/public/common/file_chooser_file_info.h" #include "favicon_manager.h" #include "net/cookies/canonical_cookie.h" +#include "third_party/blink/public/mojom/favicon/favicon_url.mojom-forward.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPixelRef.h" @@ -66,10 +67,6 @@ QT_FORWARD_DECLARE_CLASS(QMatrix4x4) QT_FORWARD_DECLARE_CLASS(QSslCertificate) -namespace content { -struct FaviconURL; -} - namespace gfx { class ImageSkiaRep; } @@ -294,7 +291,7 @@ inline QStringList fromVector(const std::vector<base::string16> &vector) return result; } -FaviconInfo toFaviconInfo(const content::FaviconURL &); +FaviconInfo toFaviconInfo(const blink::mojom::FaviconURLPtr &favicon_url); QList<QSslCertificate> toCertificateChain(net::X509Certificate *certificate); |