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

fix: [UI] Resolve method conflict between MenuModel, SimpleMenuModel::Delegate

Browse source 
1230581
This commit is contained in:
deepak1556 2018-10-25 20:26:59 +05:30
parent 2eedcde914
commit 535d264497
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_menu.cc
View file

@ -90,7 +90,7 @@ void Menu::ExecuteCommand(int command_id, int flags) {
command_id); command_id);
} }
void Menu::MenuWillShow(ui::SimpleMenuModel* source) { void Menu::OnMenuWillShow(ui::SimpleMenuModel* source) {
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());
menu_will_show_.Run(GetWrapper()); menu_will_show_.Run(GetWrapper());

2
atom/browser/api/atom_api_menu.h
View file

@ -53,7 +53,7 @@ class Menu : public mate::TrackableObject<Menu>,
ui::Accelerator* accelerator) const override; ui::Accelerator* accelerator) const override;
bool ShouldRegisterAcceleratorForCommandId(int command_id) const override; bool ShouldRegisterAcceleratorForCommandId(int command_id) const override;
void ExecuteCommand(int command_id, int event_flags) override; void ExecuteCommand(int command_id, int event_flags) override;
void MenuWillShow(ui::SimpleMenuModel* source) override; void OnMenuWillShow(ui::SimpleMenuModel* source) override;
virtual void PopupAt(TopLevelWindow* window, virtual void PopupAt(TopLevelWindow* window,
int x, int x,