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

Use DOM's way of telling modifiers

Browse source
This commit is contained in:
Cheng Zhao 2015-07-29 14:25:12 +08:00
parent 625143426a
commit 8d22eeb3be
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_tray.h
View file

@ -44,10 +44,10 @@ class Tray : public mate::EventEmitter,
// TrayIconObserver:
void OnClicked(const gfx::Rect& bounds, int modifiers) override;
void OnDoubleClicked(const gfx::Rect& bounds, int modifiers) override;
void OnRightClicked(const gfx::Rect& bounds, int modifiers) override;
void OnBalloonShow() override;
void OnBalloonClicked() override;
void OnBalloonClosed() override;
void OnRightClicked(const gfx::Rect& bounds, int modifiers) override;
void OnDropFiles(const std::vector<std::string>& files) override;
// mate::Wrappable:
@ -64,6 +64,8 @@ class Tray : public mate::EventEmitter,
void SetContextMenu(mate::Arguments* args, Menu* menu);
private:
v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
scoped_ptr<TrayIcon> tray_icon_;
DISALLOW_COPY_AND_ASSIGN(Tray);