From 917f862ebfd0a1797786c7c663acb83ff9144cde Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 5 Apr 2017 16:25:06 +0200
Subject: Adaptations for Chromium 57

Change-Id: Ia2756c1e9b13839c2330bd98cf953d47cbdac0dd
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 src/core/content_client_qt.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/core/content_client_qt.cpp')

diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index e58fa93d7..10e198d6a 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -50,6 +50,8 @@
 #include "ui/base/layout.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+
+#include "qrc_protocol_handler_qt.h"
 #include "type_conversion.h"
 
 #include <QCoreApplication>
@@ -69,7 +71,7 @@ static QString getLocalAppDataDir()
 }
 #endif
 
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
 
 // The plugin logic is based on chrome/common/chrome_content_client.cc:
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -284,7 +286,7 @@ void ContentClientQt::AddPepperPlugins(std::vector<content::PepperPluginInfo>* p
 }
 
 }
-#endif
+#endif // BUILDFLAG(ENABLE_PLUGINS)
 
 #include <QCoreApplication>
 
@@ -316,4 +318,9 @@ std::string ContentClientQt::GetProduct() const
     return productName.toStdString();
 }
 
+void ContentClientQt::AddAdditionalSchemes(Schemes* schemes)
+{
+    schemes->secure_schemes.push_back(kQrcSchemeQt);
+}
+
 } // namespace QtWebEngineCore
-- 
cgit v1.2.3