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

Merge pull request #4305 from atom/remove-unnecessary-methods

Browse source 
Remove a few unneeded overrides
This commit is contained in:
Cheng Zhao 2016-02-01 21:37:24 +08:00
commit a575192c5f
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/common_web_contents_delegate.cc
View file

@ -181,13 +181,6 @@ content::WebContents* CommonWebContentsDelegate::OpenURLFromTab(
return source; return source;
} }
void CommonWebContentsDelegate::RequestToLockMouse(
content::WebContents* web_contents,
bool user_gesture,
bool last_unlocked_by_target) {
GetWebContents()->GotResponseToLockMouseRequest(true);
}
bool CommonWebContentsDelegate::CanOverscrollContent() const { bool CommonWebContentsDelegate::CanOverscrollContent() const {
return false; return false;
} }

7
atom/browser/common_web_contents_delegate.h
View file

@ -9,10 +9,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "brightray/browser/default_web_contents_delegate.h"
#include "brightray/browser/inspectable_web_contents_impl.h" #include "brightray/browser/inspectable_web_contents_impl.h"
#include "brightray/browser/inspectable_web_contents_delegate.h" #include "brightray/browser/inspectable_web_contents_delegate.h"
#include "brightray/browser/inspectable_web_contents_view_delegate.h" #include "brightray/browser/inspectable_web_contents_view_delegate.h"
#include "content/public/browser/web_contents_delegate.h"
namespace atom { namespace atom {
@ -21,7 +21,7 @@ class NativeWindow;
class WebDialogHelper; class WebDialogHelper;
class CommonWebContentsDelegate class CommonWebContentsDelegate
: public brightray::DefaultWebContentsDelegate, : public content::WebContentsDelegate,
public brightray::InspectableWebContentsDelegate, public brightray::InspectableWebContentsDelegate,
public brightray::InspectableWebContentsViewDelegate { public brightray::InspectableWebContentsViewDelegate {
public: public:
@ -59,9 +59,6 @@ class CommonWebContentsDelegate
content::WebContents* OpenURLFromTab( content::WebContents* OpenURLFromTab(
content::WebContents* source, content::WebContents* source,
const content::OpenURLParams& params) override; const content::OpenURLParams& params) override;
void RequestToLockMouse(content::WebContents* web_contents,
bool user_gesture,
bool last_unlocked_by_target) override;
bool CanOverscrollContent() const override; bool CanOverscrollContent() const override;
content::JavaScriptDialogManager* GetJavaScriptDialogManager( content::JavaScriptDialogManager* GetJavaScriptDialogManager(
content::WebContents* source) override; content::WebContents* source) override;

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit ea6011bc9607f321258bf93e510f56f031973230 Subproject commit 2a5cd7178b641de91ca6eb0bca826fea588f923a