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

fix: make tray not block main process (#18880)

Browse source 
* fix: make tray not block main process

* make AtomMenuModel refcounted
This commit is contained in:
Shelley Vohr 2019-06-24 19:30:26 -07:00 • committed by GitHub
parent 24ffc3cfb0
commit dc2cd8e780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/ui/tray_icon_cocoa.h
View file

@ -30,6 +30,7 @@ class TrayIconCocoa : public TrayIcon, public AtomMenuModel::Observer {
void SetHighlightMode(TrayIcon::HighlightMode mode) override;
void SetIgnoreDoubleClickEvents(bool ignore) override;
bool GetIgnoreDoubleClickEvents() override;
void PopUpOnUI(scoped_refptr<AtomMenuModel> menu_model);
void PopUpContextMenu(const gfx::Point& pos,
AtomMenuModel* menu_model) override;
void SetContextMenu(AtomMenuModel* menu_model) override;