diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
| commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
| tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/core/browser_context_adapter.h | |
| parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
| parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) | |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/core/browser_context_adapter.h')
| -rw-r--r-- | src/core/browser_context_adapter.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h index 55ab688a7..cbdc80dac 100644 --- a/src/core/browser_context_adapter.h +++ b/src/core/browser_context_adapter.h @@ -138,6 +138,8 @@ public: GeolocationPermission = 1, // Reserved: // NotificationPermission = 2, + AudioCapturePermission = 3, + VideoCapturePermission = 4, }; HttpCacheType httpCacheType() const; @@ -163,6 +165,7 @@ public: UserResourceControllerHost *userResourceController(); void permissionRequestReply(const QUrl &origin, PermissionType type, bool reply); + bool checkPermission(const QUrl &origin, PermissionType type); QString httpAcceptLanguageWithoutQualities() const; QString httpAcceptLanguage() const; |