summaryrefslogtreecommitdiffstats
path: root/src/core/permission_manager_qt.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-16 10:34:26 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-06-16 08:46:25 +0000
commit925711f5f9b02392a58244e51ba7f9ea3f192b62 (patch)
tree858ed5f9c31642246276f7eccce3dfe24ac1c77a /src/core/permission_manager_qt.cpp
parent57f826abff6155c017f76eba1958979a2bc143a4 (diff)
Translate audio/video capture permission
Complete the translation for the permission types we support, but assert against media capture permission request coming in via the permission manager so we can catch if Chromium changes how they are handled. Change-Id: Ia56ebe38fd163f724de7c564c3e6098717903dfb Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/permission_manager_qt.cpp')
-rw-r--r--src/core/permission_manager_qt.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp
index 36ce476cd..9603dc94c 100644
--- a/src/core/permission_manager_qt.cpp
+++ b/src/core/permission_manager_qt.cpp
@@ -55,14 +55,16 @@ BrowserContextAdapter::PermissionType toQt(content::PermissionType type)
switch (type) {
case content::PermissionType::GEOLOCATION:
return BrowserContextAdapter::GeolocationPermission;
+ case content::PermissionType::AUDIO_CAPTURE:
+ return BrowserContextAdapter::AudioCapturePermission;
+ case content::PermissionType::VIDEO_CAPTURE:
+ return BrowserContextAdapter::VideoCapturePermission;
case content::PermissionType::NOTIFICATIONS:
case content::PermissionType::MIDI_SYSEX:
case content::PermissionType::PUSH_MESSAGING:
case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
case content::PermissionType::MIDI:
case content::PermissionType::DURABLE_STORAGE:
- case content::PermissionType::AUDIO_CAPTURE:
- case content::PermissionType::VIDEO_CAPTURE:
case content::PermissionType::NUM:
break;
}
@@ -117,6 +119,9 @@ int PermissionManagerQt::RequestPermission(content::PermissionType permission,
callback.Run(content::PERMISSION_STATUS_DENIED);
return kNoPendingOperation;
}
+ // Audio and video-capture should not come this way currently
+ Q_ASSERT(permissionType != BrowserContextAdapter::AudioCapturePermission
+ && permissionType != BrowserContextAdapter::VideoCapturePermission);
content::WebContents *webContents = frameHost->GetRenderViewHost()->GetDelegate()->GetAsWebContents();
WebContentsDelegateQt* contentsDelegate = static_cast<WebContentsDelegateQt*>(webContents->GetDelegate());