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

Merge pull request #6385 from electron/only-use-role-accelerator-in-app-menu

Browse source 
Only use default role accelerator in app menu
This commit is contained in:
Cheng Zhao 2016-07-08 11:22:21 +09:00 • committed by GitHub
commit 6e81c55880
37 changed files with 233 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/browser.h
View file

@ -25,16 +25,13 @@ class DictionaryValue;
class FilePath;
}
namespace ui {
class MenuModel;
}
namespace gfx {
class Image;
}
namespace atom {
class AtomMenuModel;
class LoginHandler;
// This class is used for control application-wide operations.
@ -138,7 +135,7 @@ class Browser : public WindowListObserver {
void DockShow();
// Set docks' menu.
void DockSetMenu(ui::MenuModel* model);
void DockSetMenu(AtomMenuModel* model);
// Set docks' icon.
void DockSetIcon(const gfx::Image& image);