From 81b370ee9f5b1990371ac4299f96fed1d3b498b2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 23 Jan 2015 15:13:49 -0800
Subject: [PATCH] Implement CheckMediaAccessPermission, fixes #1017

---
 atom/browser/api/atom_api_web_contents.cc | 6 ++++++
 atom/browser/api/atom_api_web_contents.h  | 3 +++
 vendor/brightray                          | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 6ccd223f3d6a..1b5112ffbdd2 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/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,
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index dc556b2796d5..7e65b462d934 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/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&,
diff --git a/vendor/brightray b/vendor/brightray
index ad17292154dd..a45009446ac3 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit ad17292154ddd2436c377bbe2d10fa213338f4fa
+Subproject commit a45009446ac3279b385b1de1f3226251e7f0e634