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/browser_context_adapter.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/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; |