summaryrefslogtreecommitdiffstats
path: root/src/core/javascript_dialog_manager_qt.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-02-23 17:11:05 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-27 09:13:09 +0000
commitbce063054682e590e9fa8aa9d2ec19ca26ea3d49 (patch)
tree72eafcf4e0d2c6518ffd38772f7f5758bf6a4137 /src/core/javascript_dialog_manager_qt.h
parent817c117cf89f15e1877107597c8daeff956fd1a6 (diff)
Adaptations for Chromium 56
Change-Id: I78240d7956de4716757761fc6517f031b4adb822 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/javascript_dialog_manager_qt.h')
-rw-r--r--src/core/javascript_dialog_manager_qt.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/javascript_dialog_manager_qt.h b/src/core/javascript_dialog_manager_qt.h
index 8ed86c994..77a78cd54 100644
--- a/src/core/javascript_dialog_manager_qt.h
+++ b/src/core/javascript_dialog_manager_qt.h
@@ -68,8 +68,10 @@ public:
virtual void RunBeforeUnloadDialog(content::WebContents *, bool isReload,
const content::JavaScriptDialogManager::DialogClosedCallback &callback) Q_DECL_OVERRIDE;
virtual bool HandleJavaScriptDialog(content::WebContents *, bool accept, const base::string16 *promptOverride) Q_DECL_OVERRIDE;
- virtual void CancelActiveAndPendingDialogs(content::WebContents *contents) Q_DECL_OVERRIDE { takeDialogForContents(contents); }
- virtual void ResetDialogState(content::WebContents *contents) Q_DECL_OVERRIDE { takeDialogForContents(contents); }
+ virtual void CancelDialogs(content::WebContents *contents, bool /*suppress_callbacks*/, bool /*reset_state*/) Q_DECL_OVERRIDE
+ {
+ takeDialogForContents(contents);
+ }
void runDialogForContents(content::WebContents *, WebContentsAdapterClient::JavascriptDialogType, const QString &messageText, const QString &defaultPrompt
, const QUrl &,const content::JavaScriptDialogManager::DialogClosedCallback &callback, const QString &title = QString());