Adaptations for Chromium 67

Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 12 insertions, 4 deletions

diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 4c1d4990c..540774fab 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -42,7 +42,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/content_browser_client.h"
-#include "ppapi/features/features.h"
+#include "ppapi/buildflags/buildflags.h"
 
 #include <QtGlobal>
 
@@ -63,6 +63,7 @@ class RenderFrameHost;
 class RenderProcessHost;
 class RenderViewHostDelegateView;
 class ResourceContext;
+class ResourceDispatcherHostDelegate;
 class WebContentsViewPort;
 class WebContents;
 struct MainFunctionParams;
@@ -77,7 +78,6 @@ namespace QtWebEngineCore {
 
 class BrowserMainPartsQt;
 class ProfileQt;
-class ResourceDispatcherHostDelegateQt;
 class ShareGroupQtQuick;
 
 class ContentBrowserClientQt : public content::ContentBrowserClient {
@@ -181,18 +181,26 @@ public:
     void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
 #endif
 
-    content::ResourceDispatcherHostLoginDelegate *CreateLoginDelegate(
+    scoped_refptr<content::LoginDelegate> CreateLoginDelegate(
             net::AuthChallengeInfo *auth_info,
             content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
             bool is_main_frame,
             const GURL &url,
             bool first_auth_attempt,
             const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&auth_required_callback) override;
+    bool HandleExternalProtocol(
+            const GURL &url,
+            content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+            int child_id,
+            content::NavigationUIData  *navigation_data,
+            bool is_main_frame,
+            ui::PageTransition page_transition,
+            bool has_user_gesture) override;
 
 private:
     void InitFrameInterfaces();
     BrowserMainPartsQt* m_browserMainParts;
-    std::unique_ptr<ResourceDispatcherHostDelegateQt> m_resourceDispatcherHostDelegate;
+    std::unique_ptr<content::ResourceDispatcherHostDelegate> m_resourceDispatcherHostDelegate;
     scoped_refptr<ShareGroupQtQuick> m_shareGroupQtQuick;
     std::unique_ptr<service_manager::BinderRegistry> m_frameInterfaces;
     std::unique_ptr<service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>> m_frameInterfacesParameterized;