From f4a8ce98bd371acf1ca1eb2c58a8403e8795a670 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 19 Dec 2017 12:37:02 +0100 Subject: Adaptations for Chromium 63 Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84 Reviewed-by: Peter Varga --- src/core/javascript_dialog_controller.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/javascript_dialog_controller.cpp') diff --git a/src/core/javascript_dialog_controller.cpp b/src/core/javascript_dialog_controller.cpp index 5b695b6cf..86f5b9795 100644 --- a/src/core/javascript_dialog_controller.cpp +++ b/src/core/javascript_dialog_controller.cpp @@ -40,7 +40,7 @@ #include "javascript_dialog_controller.h" #include "javascript_dialog_controller_p.h" -#include"javascript_dialog_manager_qt.h" +#include "javascript_dialog_manager_qt.h" #include "type_conversion.h" namespace QtWebEngineCore { @@ -51,18 +51,18 @@ void JavaScriptDialogControllerPrivate::dialogFinished(bool accepted, const base // but hold a shared pointer so the dialog does not get deleted prematurely when running in-process. QSharedPointer dialog = JavaScriptDialogManagerQt::GetInstance()->takeDialogForContents(contents); - callback.Run(accepted, promptValue); + std::move(callback).Run(accepted, promptValue); } JavaScriptDialogControllerPrivate::JavaScriptDialogControllerPrivate(WebContentsAdapterClient::JavascriptDialogType t, const QString &msg, const QString &prompt , const QString &title, const QUrl &securityOrigin - , const content::JavaScriptDialogManager::DialogClosedCallback &cb, content::WebContents *c) + , content::JavaScriptDialogManager::DialogClosedCallback &&cb, content::WebContents *c) : type(t) , message(msg) , defaultPrompt(prompt) , securityOrigin(securityOrigin) , title(title) - , callback(cb) + , callback(std::move(cb)) , contents(c) { } -- cgit v1.2.3