Adaptations for Chromium 60

Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 48 insertions, 3 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 5bce81f25..a087940ef 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -69,7 +69,8 @@
 #include "device/geolocation/geolocation_provider.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/bind_source_info.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "third_party/WebKit/public/platform/modules/sensitive_input_visibility/sensitive_input_visibility_service.mojom.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/screen.h"
@@ -489,6 +490,7 @@ void ContentBrowserClientQt::AllowCertificateError(content::WebContents *webCont
 
 void ContentBrowserClientQt::SelectClientCertificate(content::WebContents * /*webContents*/,
                                                      net::SSLCertRequestInfo * /*certRequestInfo*/,
+                                                     net::CertificateList /*client_certs*/,
                                                      std::unique_ptr<content::ClientCertificateDelegate> delegate)
 {
     delegate->ContinueWithCertificate(nullptr);
@@ -569,6 +571,7 @@ public:
         return FromWebContents(web_contents);
     }
     static void BindSensitiveInputVisibilityService(content::RenderFrameHost* render_frame_host,
+                                                    const service_manager::BindSourceInfo& source_info,
                                                     blink::mojom::SensitiveInputVisibilityServiceRequest request)
     {
         CreateForRenderFrameHost(render_frame_host);
@@ -595,12 +598,54 @@ private:
 
 };
 
-void ContentBrowserClientQt::RegisterRenderFrameMojoInterfaces(service_manager::InterfaceRegistry* registry,
-                                                               content::RenderFrameHost* render_frame_host)
+void ContentBrowserClientQt::ExposeInterfacesToFrame(service_manager::BinderRegistry* registry,
+                                                     content::RenderFrameHost* render_frame_host)
 {
     registry->AddInterface(base::Bind(&ServiceDriver::BindSensitiveInputVisibilityService, render_frame_host));
 }
 
+bool ContentBrowserClientQt::CanCreateWindow(
+    content::RenderFrameHost* opener,
+    const GURL& opener_url,
+    const GURL& opener_top_level_frame_url,
+    const GURL& source_origin,
+    content::mojom::WindowContainerType container_type,
+    const GURL& target_url,
+    const content::Referrer& referrer,
+    const std::string& frame_name,
+    WindowOpenDisposition disposition,
+    const blink::mojom::WindowFeatures& features,
+    bool user_gesture,
+    bool opener_suppressed,
+    bool* no_javascript_access) {
+
+    Q_UNUSED(opener_url);
+    Q_UNUSED(opener_top_level_frame_url);
+    Q_UNUSED(source_origin);
+    Q_UNUSED(container_type);
+    Q_UNUSED(target_url);
+    Q_UNUSED(referrer);
+    Q_UNUSED(frame_name);
+    Q_UNUSED(disposition);
+    Q_UNUSED(features);
+    Q_UNUSED(opener_suppressed);
+
+    if (no_javascript_access)
+        *no_javascript_access = false;
+
+    content::WebContents* webContents = content::WebContents::FromRenderFrameHost(opener);
+
+    WebEngineSettings *settings = nullptr;
+    if (webContents) {
+        WebContentsDelegateQt* delegate =
+                static_cast<WebContentsDelegateQt*>(webContents->GetDelegate());
+        if (delegate)
+            settings = delegate->webEngineSettings();
+    }
+
+    return (settings && settings->getJavaScriptCanOpenWindowsAutomatically()) || user_gesture;
+}
+
 } // namespace QtWebEngineCore
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(QtWebEngineCore::ServiceDriver);