diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-06-19 11:17:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-04 18:41:41 +0200 |
| commit | 881339e9d9054c46f2621119246de7a13c83761a (patch) | |
| tree | 77db7d7188c4ac61cab939c2ccd7a9610d4a01f4 /src/core/type_conversion.h | |
| parent | 4d67b9f639114ddec0521980495ba27921800e39 (diff) | |
Replace FaviconManager with Chromium's Favicon Component
Task-number: QTBUG-51184
Change-Id: Ie050cb23f2c86841a66ec384bfbcdf0713cffa7c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/type_conversion.h')
| -rw-r--r-- | src/core/type_conversion.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index 85fd763b4..fff130218 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -52,7 +52,6 @@ #include <base/strings/nullable_string16.h> #include "base/files/file_path.h" #include "base/time/time.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" @@ -68,6 +67,7 @@ QT_FORWARD_DECLARE_CLASS(QMatrix4x4) QT_FORWARD_DECLARE_CLASS(QSslCertificate) namespace gfx { +class Image; class ImageSkiaRep; } @@ -222,6 +222,7 @@ QImage toQImage(const SkBitmap &bitmap); QImage toQImage(const gfx::ImageSkiaRep &imageSkiaRep); SkBitmap toSkBitmap(const QImage &image); +QIcon toQIcon(const gfx::Image &image); QIcon toQIcon(const std::vector<SkBitmap> &bitmaps); void convertToQt(const SkMatrix44 &m, QMatrix4x4 &c); @@ -272,8 +273,6 @@ inline QStringList fromVector(const std::vector<base::string16> &vector) return result; } -FaviconInfo toFaviconInfo(const blink::mojom::FaviconURLPtr &favicon_url); - QList<QSslCertificate> toCertificateChain(net::X509Certificate *certificate); Qt::InputMethodHints toQtInputMethodHints(ui::TextInputType inputType); |