mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4616 from deepak1556/media_device_enumeration_patch

Browse source 
browser: allow enumeration of media device labels
This commit is contained in:
Cheng Zhao 2016-02-26 22:07:35 +08:00
commit b25c8ca621
3 changed files with 25 additions and 0 deletions
Show stats 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, '');