diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-19 12:37:02 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-25 14:41:06 +0000 |
commit | f4a8ce98bd371acf1ca1eb2c58a8403e8795a670 (patch) | |
tree | 1f2305261b605aae31e5f8737ffcb275986baf1e /src/core/javascript_dialog_controller.cpp | |
parent | 448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (diff) |
Adaptations for Chromium 63
Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/javascript_dialog_controller.cpp')
-rw-r--r-- | src/core/javascript_dialog_controller.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<JavaScriptDialogController> 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) { } |