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

mac: Pass useDefaultAccelerator to getAcceleratorForCommandId

Browse source
This commit is contained in:
Cheng Zhao 2016-07-02 11:47:40 +09:00 • committed by Kevin Sawicki
parent 77cdc2c4a7
commit 6381f44f26
17 changed files with 102 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/ui/tray_icon_cocoa.h
View file

@ -9,7 +9,6 @@
#include <string>
#include "atom/browser/ui/atom_menu_model.h"
#include "atom/browser/ui/tray_icon.h"
#include "base/mac/scoped_nsobject.h"
@ -30,8 +29,8 @@ class TrayIconCocoa : public TrayIcon,
void SetTitle(const std::string& title) override;
void SetHighlightMode(bool highlight) override;
void PopUpContextMenu(const gfx::Point& pos,
ui::SimpleMenuModel* menu_model) override;
void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
AtomMenuModel* menu_model) override;
void SetContextMenu(AtomMenuModel* menu_model) override;
gfx::Rect GetBounds() override;
protected: