Merge branch 'master' of https://github.com/MaxWhere/electron into MaxWhere-master

This commit is contained in:
Cheng Zhao 2015-09-18 12:01:33 +08:00
commit ee0d48dc5a
11 changed files with 602 additions and 2 deletions

View file

@ -53,6 +53,7 @@ class Window : public mate::TrackableObject<Window>,
void OnPageTitleUpdated(bool* prevent_default,
const std::string& title) override;
void WillCloseWindow(bool* prevent_default) override;
void OnFrameRendered(scoped_ptr<uint8[]> rgb, const int size) override;
void OnWindowClosed() override;
void OnWindowBlur() override;
void OnWindowFocus() override;
@ -141,6 +142,11 @@ class Window : public mate::TrackableObject<Window>,
bool IsMenuBarVisible();
void SetAspectRatio(double aspect_ratio, mate::Arguments* args);
void SendKeyboardEvent(v8::Isolate* isolate, const mate::Dictionary& data);
void SendMouseEvent(v8::Isolate* isolate, const mate::Dictionary& data);
void BeginFrameSubscription();
void EndFrameSubscription();
#if defined(OS_MACOSX)
void ShowDefinitionForSelection();
#endif