From 159fb857f4f4c660d2fbdb25db70a6573c1eb957 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 1 Feb 2016 21:05:29 +0800
Subject: [PATCH 1/2] No need to override RequestToLockMouse in
 CommonWebContentsDelegate

---
 atom/browser/common_web_contents_delegate.cc | 7 -------
 atom/browser/common_web_contents_delegate.h  | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index 72a664f8cd0..1fd6f782de5 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -181,13 +181,6 @@ content::WebContents* CommonWebContentsDelegate::OpenURLFromTab(
   return source;
 }
 
-void CommonWebContentsDelegate::RequestToLockMouse(
-    content::WebContents* web_contents,
-    bool user_gesture,
-    bool last_unlocked_by_target) {
-  GetWebContents()->GotResponseToLockMouseRequest(true);
-}
-
 bool CommonWebContentsDelegate::CanOverscrollContent() const {
   return false;
 }
diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
index ee18f36660e..828729d795d 100644
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -59,9 +59,6 @@ class CommonWebContentsDelegate
   content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) override;
-  void RequestToLockMouse(content::WebContents* web_contents,
-                          bool user_gesture,
-                          bool last_unlocked_by_target) override;
   bool CanOverscrollContent() const override;
   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
       content::WebContents* source) override;

From 7d68ca21c8453c3a523432a22ec0d01cf39f4743 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 1 Feb 2016 21:09:12 +0800
Subject: [PATCH 2/2] No need of DefaultWebContentsDelegate

---
 atom/browser/common_web_contents_delegate.h | 4 ++--
 vendor/brightray                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
index 828729d795d..83ef2850bd9 100644
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -9,10 +9,10 @@
 #include <string>
 #include <vector>
 
-#include "brightray/browser/default_web_contents_delegate.h"
 #include "brightray/browser/inspectable_web_contents_impl.h"
 #include "brightray/browser/inspectable_web_contents_delegate.h"
 #include "brightray/browser/inspectable_web_contents_view_delegate.h"
+#include "content/public/browser/web_contents_delegate.h"
 
 namespace atom {
 
@@ -21,7 +21,7 @@ class NativeWindow;
 class WebDialogHelper;
 
 class CommonWebContentsDelegate
-    : public brightray::DefaultWebContentsDelegate,
+    : public content::WebContentsDelegate,
       public brightray::InspectableWebContentsDelegate,
       public brightray::InspectableWebContentsViewDelegate {
  public:
diff --git a/vendor/brightray b/vendor/brightray
index ea6011bc960..2a5cd7178b6 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit ea6011bc9607f321258bf93e510f56f031973230
+Subproject commit 2a5cd7178b641de91ca6eb0bca826fea588f923a