diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:29:06 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:29:06 +0100 |
commit | 7a318602581fac0d4ad414ee62437554e9c9e959 (patch) | |
tree | a529e1cdee56947fd6194eee7f38987c06ca9a1a /src/core/content_browser_client_qt.h | |
parent | 54e05945b0ec4328b9d56b3b6a9886fc24ad3e6a (diff) | |
parent | f8bdc6c7de5ace3ff4b0335cf425e0ebb21ed75d (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/3rdparty
src/core/content_browser_client_qt.h
src/core/core_module.pro
Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
Diffstat (limited to 'src/core/content_browser_client_qt.h')
-rw-r--r-- | src/core/content_browser_client_qt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 879546994..84b0734da 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -79,6 +79,7 @@ public: virtual gfx::GLShareGroup* GetInProcessGpuShareGroup() Q_DECL_OVERRIDE; virtual content::MediaObserver* GetMediaObserver() Q_DECL_OVERRIDE; virtual content::AccessTokenStore* CreateAccessTokenStore() Q_DECL_OVERRIDE; + virtual content::QuotaPermissionContext *CreateQuotaPermissionContext() Q_DECL_OVERRIDE; virtual void OverrideWebkitPrefs(content::RenderViewHost *, const GURL &, WebPreferences *) Q_DECL_OVERRIDE; virtual void AllowCertificateError( int render_process_id, |