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

Remove the JavaScript wrapper for setContextMenu

Browse source
This commit is contained in:
Cheng Zhao 2016-05-20 16:18:38 +09:00
parent adfd99f5f0
commit 67d9ae27c3
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,13 +64,14 @@ class Tray : public mate::TrackableObject<Tray>,
void SetHighlightMode(bool highlight);
void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
void PopUpContextMenu(mate::Arguments* args);
void SetContextMenu(Menu* menu);
void SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu);
private:
v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
v8::Global<v8::Object> image_;
v8::Global<v8::Object> pressed_image_;
v8::Global<v8::Object> menu_;
scoped_ptr<TrayIcon> tray_icon_;
DISALLOW_COPY_AND_ASSIGN(Tray);