Adaptations for Chromium 83

Change-Id: I63ed851426b18623d549ceaf87f1b6eeec527966
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp
index 403125784..1d8d63257 100644
--- a/src/core/type_conversion.cpp
+++ b/src/core/type_conversion.cpp
@@ -39,11 +39,11 @@
 
 #include "type_conversion.h"
 
-#include <content/public/common/favicon_url.h>
 #include <net/cert/x509_certificate.h>
 #include <net/cert/x509_util.h>
 #include <ui/events/event_constants.h>
 #include <ui/gfx/image/image_skia.h>
+#include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qmatrix4x4.h>
@@ -242,27 +242,27 @@ int flagsFromModifiers(Qt::KeyboardModifiers modifiers)
     return modifierFlags;
 }
 
-FaviconInfo::FaviconTypeFlags toQt(content::FaviconURL::IconType type)
+FaviconInfo::FaviconTypeFlags toQt(blink::mojom::FaviconIconType type)
 {
     switch (type) {
-    case content::FaviconURL::IconType::kFavicon:
+    case blink::mojom::FaviconIconType::kFavicon:
         return FaviconInfo::Favicon;
-    case content::FaviconURL::IconType::kTouchIcon:
+    case blink::mojom::FaviconIconType::kTouchIcon:
         return FaviconInfo::TouchIcon;
-    case content::FaviconURL::IconType::kTouchPrecomposedIcon:
+    case blink::mojom::FaviconIconType::kTouchPrecomposedIcon:
         return FaviconInfo::TouchPrecomposedIcon;
-    case content::FaviconURL::IconType::kInvalid:
+    case blink::mojom::FaviconIconType::kInvalid:
         return FaviconInfo::InvalidIcon;
     }
     Q_UNREACHABLE();
     return FaviconInfo::InvalidIcon;
 }
 
-FaviconInfo toFaviconInfo(const content::FaviconURL &favicon_url)
+FaviconInfo toFaviconInfo(const blink::mojom::FaviconURLPtr &favicon_url)
 {
     FaviconInfo info;
-    info.url = toQt(favicon_url.icon_url);
-    info.type = toQt(favicon_url.icon_type);
+    info.url = toQt(favicon_url->icon_url);
+    info.type = toQt(favicon_url->icon_type);
     // TODO: Add support for rel sizes attribute (favicon_url.icon_sizes):
     // http://www.w3schools.com/tags/att_link_sizes.asp
     info.size = QSize(0, 0);