Merge pull request #6385 from electron/only-use-role-accelerator-in-app-menu
Only use default role accelerator in app menu
This commit is contained in:
commit
6e81c55880
37 changed files with 233 additions and 155 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue