github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 00:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
https://chromium-review.googlesource.com/c/chromium/src/+/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);
}
void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
void Menu::OnMenuWillShow(ui::SimpleMenuModel* source) {
v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate());
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;
bool ShouldRegisterAcceleratorForCommandId(int command_id) const 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,
int x,