fix: [UI] Resolve method conflict between MenuModel, SimpleMenuModel::Delegate
1230581
This commit is contained in:
parent
2eedcde914
commit
535d264497
2 changed files with 2 additions and 2 deletions
|
@ -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());
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue