diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-23 17:11:05 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-27 09:13:09 +0000 |
| commit | bce063054682e590e9fa8aa9d2ec19ca26ea3d49 (patch) | |
| tree | 72eafcf4e0d2c6518ffd38772f7f5758bf6a4137 /src/core/web_contents_delegate_qt.cpp | |
| parent | 817c117cf89f15e1877107597c8daeff956fd1a6 (diff) | |
Adaptations for Chromium 56
Change-Id: I78240d7956de4716757761fc6517f031b4adb822
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index cda234d6d..6c5b63960 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -169,7 +169,7 @@ void WebContentsDelegateQt::AddNewContents(content::WebContents* source, content void WebContentsDelegateQt::CloseContents(content::WebContents *source) { m_viewClient->close(); - GetJavaScriptDialogManager(source)->CancelActiveAndPendingDialogs(source); + GetJavaScriptDialogManager(source)->CancelDialogs(source, /* whatever?: */false, false); } void WebContentsDelegateQt::LoadProgressChanged(content::WebContents* source, double progress) @@ -335,7 +335,7 @@ void WebContentsDelegateQt::RunFileChooser(content::RenderFrameHost *frameHost, }); } -bool WebContentsDelegateQt::AddMessageToConsole(content::WebContents *source, int32_t level, const base::string16 &message, int32_t line_no, const base::string16 &source_id) +bool WebContentsDelegateQt::DidAddMessageToConsole(content::WebContents *source, int32_t level, const base::string16 &message, int32_t line_no, const base::string16 &source_id) { Q_UNUSED(source) m_viewClient->javaScriptConsoleMessage(mapToJavascriptConsoleMessageLevel(level), toQt(message), static_cast<int>(line_no), toQt(source_id)); |