From 9e64d319ca03eb47d61128b527c92ee658b804b7 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Mon, 29 Aug 2022 15:45:33 -0700 Subject: [PATCH 1/3] chore: drop unresponsive suppressor for menu_mac --- shell/browser/api/electron_api_menu_mac.mm | 2 -- 1 file changed, 2 deletions(-) diff --git a/shell/browser/api/electron_api_menu_mac.mm b/shell/browser/api/electron_api_menu_mac.mm index eff18b2efd24c..c299a91814dd8 100644 --- a/shell/browser/api/electron_api_menu_mac.mm +++ b/shell/browser/api/electron_api_menu_mac.mm @@ -14,7 +14,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "shell/browser/native_window.h" -#include "shell/browser/unresponsive_suppressor.h" #include "shell/common/keyboard_util.h" #include "shell/common/node_includes.h" @@ -156,7 +155,6 @@ base::mac::ScopedSendingEvent sendingEventScoper; // Don't emit unresponsive event when showing menu. - electron::UnresponsiveSuppressor suppressor; [menu popUpMenuPositioningItem:item atLocation:position inView:view]; } From 4310f206cc487fde5e812f83a5ae44811f21c14d Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Mon, 29 Aug 2022 16:05:36 -0700 Subject: [PATCH 2/3] also for views --- shell/browser/api/electron_api_menu_views.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/shell/browser/api/electron_api_menu_views.cc b/shell/browser/api/electron_api_menu_views.cc index 908ae1bc925c1..8630fa7d1073d 100644 --- a/shell/browser/api/electron_api_menu_views.cc +++ b/shell/browser/api/electron_api_menu_views.cc @@ -39,9 +39,6 @@ void MenuViews::PopupAt(BaseWindow* window, int flags = MenuRunner::CONTEXT_MENU | MenuRunner::HAS_MNEMONICS; - // Don't emit unresponsive event when showing menu. - electron::UnresponsiveSuppressor suppressor; - // Make sure the Menu object would not be garbage-collected until the callback // has run. base::OnceClosure callback_with_ref = BindSelfToClosure(std::move(callback)); From 4fca9d033ea6eaa1645361cdc8d752696fef73bf Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Mon, 29 Aug 2022 16:11:09 -0700 Subject: [PATCH 3/3] header --- shell/browser/api/electron_api_menu_views.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/browser/api/electron_api_menu_views.cc b/shell/browser/api/electron_api_menu_views.cc index 8630fa7d1073d..f4e3d3317d047 100644 --- a/shell/browser/api/electron_api_menu_views.cc +++ b/shell/browser/api/electron_api_menu_views.cc @@ -8,7 +8,6 @@ #include #include "shell/browser/native_window_views.h" -#include "shell/browser/unresponsive_suppressor.h" #include "ui/display/screen.h" using views::MenuRunner;