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_manager_qt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/javascript_dialog_manager_qt.h') diff --git a/src/core/javascript_dialog_manager_qt.h b/src/core/javascript_dialog_manager_qt.h index 291f027a9..2856b30f0 100644 --- a/src/core/javascript_dialog_manager_qt.h +++ b/src/core/javascript_dialog_manager_qt.h @@ -39,6 +39,7 @@ #ifndef JAVASCRIPT_DIALOG_MANAGER_QT_H #define JAVASCRIPT_DIALOG_MANAGER_QT_H +#include "base/callback.h" #include "content/public/browser/javascript_dialog_manager.h" #include "web_contents_adapter_client.h" @@ -61,11 +62,10 @@ public: void RunJavaScriptDialog(content::WebContents *, const GURL &, content::JavaScriptDialogType dialog_type, const base::string16 &messageText, const base::string16 &defaultPromptText, - const content::JavaScriptDialogManager::DialogClosedCallback &callback, + DialogClosedCallback callback, bool *didSuppressMessage) override; - void RunBeforeUnloadDialog(content::WebContents *, bool isReload, - const content::JavaScriptDialogManager::DialogClosedCallback &callback) override; + content::JavaScriptDialogManager::DialogClosedCallback callback) override; bool HandleJavaScriptDialog(content::WebContents *, bool accept, const base::string16 *promptOverride) override; void CancelDialogs(content::WebContents *contents, bool /*reset_state*/) override { @@ -73,7 +73,7 @@ public: } void runDialogForContents(content::WebContents *, WebContentsAdapterClient::JavascriptDialogType, const QString &messageText, const QString &defaultPrompt - , const QUrl &,const content::JavaScriptDialogManager::DialogClosedCallback &callback, const QString &title = QString()); + , const QUrl &, DialogClosedCallback &&callback, const QString &title = QString()); QSharedPointer takeDialogForContents(content::WebContents *); private: -- cgit v1.2.3