diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-23 13:03:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-01 11:50:03 +0200 |
commit | 7cf83c03860536739c010c406e6a22e25d3444db (patch) | |
tree | f6d8b1316bb23809aa95afba3946eae40ffab94f /src/core/javascript_dialog_manager_qt.h | |
parent | 9a43ea339594a1e9bbd3fd8a74565f37b802b26f (diff) |
Other changes for Chromium 44
Minor changes for Chromium 44 that didn't fit in anywhere else.
Change-Id: I569422239acd077e33e1878a1d5dc7afeac0bea6
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/javascript_dialog_manager_qt.h')
-rw-r--r-- | src/core/javascript_dialog_manager_qt.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/javascript_dialog_manager_qt.h b/src/core/javascript_dialog_manager_qt.h index 4682ce5b8..8bf7ac6b9 100644 --- a/src/core/javascript_dialog_manager_qt.h +++ b/src/core/javascript_dialog_manager_qt.h @@ -66,8 +66,7 @@ public: const content::JavaScriptDialogManager::DialogClosedCallback &callback) Q_DECL_OVERRIDE { Q_UNUSED(messageText); Q_UNUSED(isReload); Q_UNUSED(callback); } 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 WebContentsDestroyed(content::WebContents *contents) Q_DECL_OVERRIDE { takeDialogForContents(contents); } - + virtual void ResetDialogState(content::WebContents *contents) 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()); |