github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-24 14:57:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

browser: allow enumeration of media device labels

Browse Source
This commit is contained in:
Robo
2016-02-26 15:47:28 +05:30
parent a21e095a59
commit fce641aab6
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
atom/browser/api/atom_api_web_contents.cc
View File

@@ -463,6 +463,13 @@ void WebContents::FindReply(content::WebContents* web_contents,
}
}
bool WebContents::CheckMediaAccessPermission(
content::WebContents* web_contents,
const GURL& security_origin,
content::MediaStreamType type) {
return true;
}
void WebContents::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,

4
atom/browser/api/atom_api_web_contents.h
View File

@@ -202,6 +202,10 @@ class WebContents : public mate::TrackableObject<WebContents>,
const gfx::Rect& selection_rect,
int active_match_ordinal,
bool final_update) override;
bool CheckMediaAccessPermission(
content::WebContents* web_contents,
const GURL& security_origin,
content::MediaStreamType type) override;
void RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,

14
spec/chromium-spec.js
View File

@@ -87,6 +87,20 @@ describe('chromium feature', function() {
});
});
describe('navigator.mediaDevices', function() {
if (process.env.TRAVIS === 'true') {
return;
}
it('can return labels of enumerated devices', function(done) {
navigator.mediaDevices.enumerateDevices().then((devices) => {
const result = devices.some((device) => !!device.label);
if (result)
done();
});
});
});
describe('navigator.language', function() {
it('should not be empty', function() {
assert.notEqual(navigator.language, '');