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

Merge branch 'master' of https://github.com/brenca/electron

Browse source 
Conflicts:
	atom/browser/api/atom_api_window.h
	atom/browser/native_window.cc
This commit is contained in:
Heilig Benedek 2015-08-31 18:46:29 +02:00
commit 3dd3fd9200
5 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/native_window.h
View file

@ -242,6 +242,8 @@ class NativeWindow : public content::WebContentsObserver,
void SendMouseEvent(blink::WebInputEvent::Type type, int modifiers, blink::WebMouseEvent::Button button, int x, int y, int movementX, int movementY, int clickCount);
void SendMouseWheelEvent(int modifiers, int x, int y, bool clickCount);
void SetOffscreenRender(bool isOffscreen);
protected:
NativeWindow(brightray::InspectableWebContents* inspectable_web_contents,
const mate::Dictionary& options);
@ -253,7 +255,6 @@ class NativeWindow : public content::WebContentsObserver,
// content::WebContentsObserver:
void RenderViewCreated(content::RenderViewHost* render_view_host) override;
void RenderViewReady() override;
void DidFinishLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url) override;
void BeforeUnloadDialogCancelled() override;
void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override;