diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 09:05:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 15:33:49 +0000 |
| commit | 22a550303618202135e58f5673e7b8935d578687 (patch) | |
| tree | 560918164edd7b76a2a8b6246f6dbca0ee69cf9a /src/core/web_contents_delegate_qt.h | |
| parent | f8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff) | |
| parent | 7978feadee937299798372bced1680f52b4b1842 (diff) | |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
Diffstat (limited to 'src/core/web_contents_delegate_qt.h')
| -rw-r--r-- | src/core/web_contents_delegate_qt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h index 12e33eb1e..e6deaa409 100644 --- a/src/core/web_contents_delegate_qt.h +++ b/src/core/web_contents_delegate_qt.h @@ -100,10 +100,12 @@ public: virtual bool IsPopupOrPanel(const content::WebContents *source) const Q_DECL_OVERRIDE; virtual void UpdateTargetURL(content::WebContents* source, const GURL& url) Q_DECL_OVERRIDE; virtual void RequestToLockMouse(content::WebContents *web_contents, bool user_gesture, bool last_unlocked_by_target) Q_DECL_OVERRIDE; + virtual bool ShouldPreserveAbortedURLs(content::WebContents *source) Q_DECL_OVERRIDE; virtual void ShowValidationMessage(content::WebContents *web_contents, const gfx::Rect &anchor_in_root_view, const base::string16 &main_text, const base::string16 &sub_text) Q_DECL_OVERRIDE; virtual void HideValidationMessage(content::WebContents *web_contents) Q_DECL_OVERRIDE; virtual void MoveValidationMessage(content::WebContents *web_contents, const gfx::Rect &anchor_in_root_view) Q_DECL_OVERRIDE; void BeforeUnloadFired(content::WebContents* tab, bool proceed, bool* proceed_to_fire_unload) Q_DECL_OVERRIDE; + bool CheckMediaAccessPermission(content::WebContents *web_contents, const GURL& security_origin, content::MediaStreamType type) Q_DECL_OVERRIDE; // WebContentsObserver overrides virtual void RenderFrameDeleted(content::RenderFrameHost *render_frame_host) Q_DECL_OVERRIDE; |