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

Implement CheckMediaAccessPermission, fixes #1017

Browse source
This commit is contained in:
Cheng Zhao 2015-01-23 15:13:49 -08:00
parent fe81e5b32d
commit 81b370ee9f
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_web_contents.cc
View file

@ -152,6 +152,12 @@ void WebContents::EnumerateDirectory(content::WebContents* guest,
web_dialog_helper_->EnumerateDirectory(guest, request_id, path); web_dialog_helper_->EnumerateDirectory(guest, request_id, path);
} }
bool WebContents::CheckMediaAccessPermission(content::WebContents* web_contents,
const GURL& security_origin,
content::MediaStreamType type) {
return true;
}
void WebContents::RequestMediaAccessPermission( void WebContents::RequestMediaAccessPermission(
content::WebContents*, content::WebContents*,
const content::MediaStreamRequest& request, const content::MediaStreamRequest& request,

3
atom/browser/api/atom_api_web_contents.h
View file

@ -134,6 +134,9 @@ class WebContents : public mate::EventEmitter,
void EnumerateDirectory(content::WebContents* web_contents, void EnumerateDirectory(content::WebContents* web_contents,
int request_id, int request_id,
const base::FilePath& path) override; const base::FilePath& path) override;
bool CheckMediaAccessPermission(content::WebContents* web_contents,
const GURL& security_origin,
content::MediaStreamType type) override;
void RequestMediaAccessPermission( void RequestMediaAccessPermission(
content::WebContents*, content::WebContents*,
const content::MediaStreamRequest&, const content::MediaStreamRequest&,

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit ad17292154ddd2436c377bbe2d10fa213338f4fa Subproject commit a45009446ac3279b385b1de1f3226251e7f0e634