chore: remove UnresponsiveSuppressor altogether (#35507)
* chore: drop unresponsive suppressor for menu_mac * also for views * header * chore: remove UnresponsiveSuppressor altogether
This commit is contained in:
parent
a0c20fef96
commit
a0dbae72c8
8 changed files with 1 additions and 66 deletions
|
@ -507,8 +507,6 @@ filenames = {
|
||||||
"shell/browser/ui/tray_icon_observer.h",
|
"shell/browser/ui/tray_icon_observer.h",
|
||||||
"shell/browser/ui/webui/accessibility_ui.cc",
|
"shell/browser/ui/webui/accessibility_ui.cc",
|
||||||
"shell/browser/ui/webui/accessibility_ui.h",
|
"shell/browser/ui/webui/accessibility_ui.h",
|
||||||
"shell/browser/unresponsive_suppressor.cc",
|
|
||||||
"shell/browser/unresponsive_suppressor.h",
|
|
||||||
"shell/browser/web_contents_permission_helper.cc",
|
"shell/browser/web_contents_permission_helper.cc",
|
||||||
"shell/browser/web_contents_permission_helper.h",
|
"shell/browser/web_contents_permission_helper.h",
|
||||||
"shell/browser/web_contents_preferences.cc",
|
"shell/browser/web_contents_preferences.cc",
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include "shell/browser/api/electron_api_web_contents_view.h"
|
#include "shell/browser/api/electron_api_web_contents_view.h"
|
||||||
#include "shell/browser/browser.h"
|
#include "shell/browser/browser.h"
|
||||||
#include "shell/browser/native_browser_view.h"
|
#include "shell/browser/native_browser_view.h"
|
||||||
#include "shell/browser/unresponsive_suppressor.h"
|
|
||||||
#include "shell/browser/web_contents_preferences.h"
|
#include "shell/browser/web_contents_preferences.h"
|
||||||
#include "shell/browser/window_list.h"
|
#include "shell/browser/window_list.h"
|
||||||
#include "shell/common/color_util.h"
|
#include "shell/common/color_util.h"
|
||||||
|
@ -506,8 +505,7 @@ void BrowserWindow::ScheduleUnresponsiveEvent(int ms) {
|
||||||
|
|
||||||
void BrowserWindow::NotifyWindowUnresponsive() {
|
void BrowserWindow::NotifyWindowUnresponsive() {
|
||||||
window_unresponsive_closure_.Cancel();
|
window_unresponsive_closure_.Cancel();
|
||||||
if (!window_->IsClosed() && window_->IsEnabled() &&
|
if (!window_->IsClosed() && window_->IsEnabled()) {
|
||||||
!IsUnresponsiveEventSuppressed()) {
|
|
||||||
Emit("unresponsive");
|
Emit("unresponsive");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include "shell/browser/native_window_views.h"
|
#include "shell/browser/native_window_views.h"
|
||||||
#include "shell/browser/ui/file_dialog.h"
|
#include "shell/browser/ui/file_dialog.h"
|
||||||
#include "shell/browser/ui/gtk_util.h"
|
#include "shell/browser/ui/gtk_util.h"
|
||||||
#include "shell/browser/unresponsive_suppressor.h"
|
|
||||||
#include "shell/common/gin_converters/file_path_converter.h"
|
#include "shell/common/gin_converters/file_path_converter.h"
|
||||||
#include "ui/base/glib/glib_signal.h"
|
#include "ui/base/glib/glib_signal.h"
|
||||||
#include "ui/gtk/gtk_ui.h" // nogncheck
|
#include "ui/gtk/gtk_ui.h" // nogncheck
|
||||||
|
@ -222,7 +221,6 @@ class FileChooserDialog {
|
||||||
void AddFilters(const Filters& filters);
|
void AddFilters(const Filters& filters);
|
||||||
|
|
||||||
electron::NativeWindowViews* parent_;
|
electron::NativeWindowViews* parent_;
|
||||||
electron::UnresponsiveSuppressor unresponsive_suppressor_;
|
|
||||||
|
|
||||||
GtkFileChooser* dialog_;
|
GtkFileChooser* dialog_;
|
||||||
GtkWidget* preview_;
|
GtkWidget* preview_;
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
#include "base/win/registry.h"
|
#include "base/win/registry.h"
|
||||||
#include "shell/browser/native_window_views.h"
|
#include "shell/browser/native_window_views.h"
|
||||||
#include "shell/browser/ui/win/dialog_thread.h"
|
#include "shell/browser/ui/win/dialog_thread.h"
|
||||||
#include "shell/browser/unresponsive_suppressor.h"
|
|
||||||
#include "shell/common/gin_converters/file_path_converter.h"
|
#include "shell/common/gin_converters/file_path_converter.h"
|
||||||
|
|
||||||
namespace file_dialog {
|
namespace file_dialog {
|
||||||
|
@ -102,7 +101,6 @@ static void SetDefaultFolder(IFileDialog* dialog,
|
||||||
|
|
||||||
static HRESULT ShowFileDialog(IFileDialog* dialog,
|
static HRESULT ShowFileDialog(IFileDialog* dialog,
|
||||||
const DialogSettings& settings) {
|
const DialogSettings& settings) {
|
||||||
electron::UnresponsiveSuppressor suppressor;
|
|
||||||
HWND parent_window =
|
HWND parent_window =
|
||||||
settings.parent_window
|
settings.parent_window
|
||||||
? static_cast<electron::NativeWindowViews*>(settings.parent_window)
|
? static_cast<electron::NativeWindowViews*>(settings.parent_window)
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include "shell/browser/native_window_observer.h"
|
#include "shell/browser/native_window_observer.h"
|
||||||
#include "shell/browser/native_window_views.h"
|
#include "shell/browser/native_window_views.h"
|
||||||
#include "shell/browser/ui/gtk_util.h"
|
#include "shell/browser/ui/gtk_util.h"
|
||||||
#include "shell/browser/unresponsive_suppressor.h"
|
|
||||||
#include "ui/base/glib/glib_signal.h"
|
#include "ui/base/glib/glib_signal.h"
|
||||||
#include "ui/gfx/image/image_skia.h"
|
#include "ui/gfx/image/image_skia.h"
|
||||||
#include "ui/gtk/gtk_ui.h" // nogncheck
|
#include "ui/gtk/gtk_ui.h" // nogncheck
|
||||||
|
@ -187,8 +186,6 @@ class GtkMessageBox : public NativeWindowObserver {
|
||||||
CHROMEG_CALLBACK_0(GtkMessageBox, void, OnCheckboxToggled, GtkWidget*);
|
CHROMEG_CALLBACK_0(GtkMessageBox, void, OnCheckboxToggled, GtkWidget*);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
electron::UnresponsiveSuppressor unresponsive_suppressor_;
|
|
||||||
|
|
||||||
// The id of the dialog.
|
// The id of the dialog.
|
||||||
absl::optional<int> id_;
|
absl::optional<int> id_;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
#include "shell/browser/browser.h"
|
#include "shell/browser/browser.h"
|
||||||
#include "shell/browser/native_window_views.h"
|
#include "shell/browser/native_window_views.h"
|
||||||
#include "shell/browser/ui/win/dialog_thread.h"
|
#include "shell/browser/ui/win/dialog_thread.h"
|
||||||
#include "shell/browser/unresponsive_suppressor.h"
|
|
||||||
#include "ui/gfx/icon_util.h"
|
#include "ui/gfx/icon_util.h"
|
||||||
#include "ui/gfx/image/image_skia.h"
|
#include "ui/gfx/image/image_skia.h"
|
||||||
|
|
||||||
|
@ -275,7 +274,6 @@ DialogResult ShowTaskDialogUTF8(const MessageBoxSettings& settings,
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
|
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
|
||||||
electron::UnresponsiveSuppressor suppressor;
|
|
||||||
DialogResult result = ShowTaskDialogUTF8(settings, nullptr);
|
DialogResult result = ShowTaskDialogUTF8(settings, nullptr);
|
||||||
return result.button_id;
|
return result.button_id;
|
||||||
}
|
}
|
||||||
|
@ -326,7 +324,6 @@ void CloseMessageBox(int id) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
|
void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
|
||||||
electron::UnresponsiveSuppressor suppressor;
|
|
||||||
ShowTaskDialogWstr(nullptr, MessageBoxType::kError, {}, -1, 0, false,
|
ShowTaskDialogWstr(nullptr, MessageBoxType::kError, {}, -1, 0, false,
|
||||||
u"Error", title, content, u"", false, gfx::ImageSkia(),
|
u"Error", title, content, u"", false, gfx::ImageSkia(),
|
||||||
nullptr);
|
nullptr);
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
// Copyright (c) 2016 GitHub, Inc.
|
|
||||||
// Use of this source code is governed by the MIT license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
#include "shell/browser/unresponsive_suppressor.h"
|
|
||||||
|
|
||||||
namespace electron {
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
|
|
||||||
int g_suppress_level = 0;
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
bool IsUnresponsiveEventSuppressed() {
|
|
||||||
return g_suppress_level > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
UnresponsiveSuppressor::UnresponsiveSuppressor() {
|
|
||||||
g_suppress_level++;
|
|
||||||
}
|
|
||||||
|
|
||||||
UnresponsiveSuppressor::~UnresponsiveSuppressor() {
|
|
||||||
g_suppress_level--;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace electron
|
|
|
@ -1,24 +0,0 @@
|
||||||
// Copyright (c) 2016 GitHub, Inc.
|
|
||||||
// Use of this source code is governed by the MIT license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
#ifndef ELECTRON_SHELL_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
|
|
||||||
#define ELECTRON_SHELL_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
|
|
||||||
|
|
||||||
namespace electron {
|
|
||||||
|
|
||||||
bool IsUnresponsiveEventSuppressed();
|
|
||||||
|
|
||||||
class UnresponsiveSuppressor {
|
|
||||||
public:
|
|
||||||
UnresponsiveSuppressor();
|
|
||||||
~UnresponsiveSuppressor();
|
|
||||||
|
|
||||||
// disable copy
|
|
||||||
UnresponsiveSuppressor(const UnresponsiveSuppressor&) = delete;
|
|
||||||
UnresponsiveSuppressor& operator=(const UnresponsiveSuppressor&) = delete;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace electron
|
|
||||||
|
|
||||||
#endif // ELECTRON_SHELL_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
|
|
Loading…
Reference in a new issue