From 98bf5bf3edcd05c258862110df434db5e9c41a36 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 23 Jan 2015 15:12:24 -0800
Subject: [PATCH] Implement CheckMediaAccessPermission

Part of the fixes for #1017.
---
 brightray/browser/default_web_contents_delegate.cc | 7 +++++++
 brightray/browser/default_web_contents_delegate.h  | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/brightray/browser/default_web_contents_delegate.cc b/brightray/browser/default_web_contents_delegate.cc
index 05bdac399a..4c7051ba18 100644
--- a/brightray/browser/default_web_contents_delegate.cc
+++ b/brightray/browser/default_web_contents_delegate.cc
@@ -10,6 +10,13 @@ DefaultWebContentsDelegate::DefaultWebContentsDelegate() {
 DefaultWebContentsDelegate::~DefaultWebContentsDelegate() {
 }
 
+bool DefaultWebContentsDelegate::CheckMediaAccessPermission(
+    content::WebContents* web_contents,
+    const GURL& security_origin,
+    content::MediaStreamType type) {
+  return true;
+}
+
 void DefaultWebContentsDelegate::RequestMediaAccessPermission(
     content::WebContents*,
     const content::MediaStreamRequest& request,
diff --git a/brightray/browser/default_web_contents_delegate.h b/brightray/browser/default_web_contents_delegate.h
index e4d177c4af..2e1ce681a7 100644
--- a/brightray/browser/default_web_contents_delegate.h
+++ b/brightray/browser/default_web_contents_delegate.h
@@ -13,12 +13,15 @@ class DefaultWebContentsDelegate : public content::WebContentsDelegate {
   ~DefaultWebContentsDelegate();
 
  protected:
-  virtual void RequestMediaAccessPermission(
+  bool CheckMediaAccessPermission(content::WebContents* web_contents,
+                                  const GURL& security_origin,
+                                  content::MediaStreamType type) override;
+  void RequestMediaAccessPermission(
       content::WebContents*,
       const content::MediaStreamRequest&,
       const content::MediaResponseCallback&) override;
 #if defined(OS_MACOSX)
-  virtual void HandleKeyboardEvent(
+  void HandleKeyboardEvent(
       content::WebContents*, const content::NativeWebKeyboardEvent&) override;
 #endif
 };