diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-10 16:56:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-25 10:00:35 +0000 |
| commit | 44d980ff67867cb65bfe8035326be2b461ca7172 (patch) | |
| tree | b17af444fe62213fd7ea4d740c1abbe8d6b1002d /src/core/web_contents_delegate_qt.cpp | |
| parent | 38944be4048e19a0ab6f3b8961f58e36048b53a8 (diff) | |
Rebasing on Chromium 45
Fixing the minor differences needed to work with Chromium 45.
Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 93fabf15a..e644d691f 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -172,13 +172,14 @@ void WebContentsDelegateQt::DidCommitProvisionalLoadForFrame(content::RenderFram m_viewClient->loadCommitted(); } -void WebContentsDelegateQt::DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, const base::string16& error_description) +void WebContentsDelegateQt::DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, const base::string16& error_description, bool was_ignored_by_handler) { - DidFailLoad(render_frame_host, validated_url, error_code, error_description); + DidFailLoad(render_frame_host, validated_url, error_code, error_description, was_ignored_by_handler); } -void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, const base::string16& error_description) +void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, const base::string16& error_description, bool was_ignored_by_handler) { + Q_UNUSED(was_ignored_by_handler); if (m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID()) || render_frame_host->GetParent()) return; |