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

Remove manual lifetime check for Tray

Browse source
This commit is contained in:
Cheng Zhao 2015-07-06 18:24:40 +08:00
parent 54dac0f37a
commit 1569dfa2e8
2 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,9 @@ class Tray : public mate::EventEmitter,
void OnBalloonClicked() override;
void OnBalloonClosed() override;
// mate::Wrappable:
bool IsDestroyed() const override;
void Destroy();
void SetImage(mate::Arguments* args, const gfx::Image& image);
void SetPressedImage(mate::Arguments* args, const gfx::Image& image);
@ -57,8 +60,6 @@ class Tray : public mate::EventEmitter,
void SetContextMenu(mate::Arguments* args, Menu* menu);
private:
bool CheckTrayLife(mate::Arguments* args);
scoped_ptr<TrayIcon> tray_icon_;
DISALLOW_COPY_AND_ASSIGN(Tray);