diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
| commit | d8a590676b6c7d72406bd2f9b8185f38282fdfa7 (patch) | |
| tree | c081ff601ae4a56ecda95f52ca17e4bcfe402a1f /src/core/web_contents_delegate_qt.h | |
| parent | 0c6147d9b5ffbe18bfe1e8deb9cc128c9a0fad27 (diff) | |
| parent | e643f766fa23ee73f7095d7ba20a385cef0f25a0 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
Diffstat (limited to 'src/core/web_contents_delegate_qt.h')
| -rw-r--r-- | src/core/web_contents_delegate_qt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h index 1728c447d..3fda96113 100644 --- a/src/core/web_contents_delegate_qt.h +++ b/src/core/web_contents_delegate_qt.h @@ -93,6 +93,7 @@ public: virtual void MoveValidationMessage(content::WebContents *web_contents, const gfx::Rect &anchor_in_root_view) Q_DECL_OVERRIDE; // WebContentsObserver overrides + virtual void RenderFrameDeleted(content::RenderFrameHost *render_frame_host) Q_DECL_OVERRIDE; virtual void DidStartProvisionalLoadForFrame(content::RenderFrameHost *render_frame_host, const GURL &validated_url, bool is_error_page, bool is_iframe_srcdoc) Q_DECL_OVERRIDE; virtual void DidCommitProvisionalLoadForFrame(content::RenderFrameHost *render_frame_host, const GURL &url, ui::PageTransition transition_type) Q_DECL_OVERRIDE; virtual void DidFailProvisionalLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url, |