Browse Source

Implement CheckMediaAccessPermission, fixes #1017

Cheng Zhao 10 years ago
parent
commit
81b370ee9f

+ 6 - 0
atom/browser/api/atom_api_web_contents.cc

@@ -152,6 +152,12 @@ void WebContents::EnumerateDirectory(content::WebContents* guest,
   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(
     content::WebContents*,
     const content::MediaStreamRequest& request,

+ 3 - 0
atom/browser/api/atom_api_web_contents.h

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

+ 1 - 1
vendor/brightray

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