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

fix: delay emitting powerMonitor events on windows (#25836)

Browse source 
* fix: delay emitting powerMonitor events

* Update electron_api_power_monitor_win.cc

* Update electron_api_power_monitor_win.cc

* syntax

* Update electron_api_power_monitor_win.cc

* Update electron_api_power_monitor_win.cc
This commit is contained in:
Jeremy Rose 2020-10-26 18:25:23 -07:00 committed by GitHub
parent 184bccdc7d
commit ae323565f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/electron_api_power_monitor.h
View file

@ -78,8 +78,6 @@ class PowerMonitor : public gin::Wrappable<PowerMonitor>,
PowerObserverLinux power_observer_linux_{this}; PowerObserverLinux power_observer_linux_{this};
#endif #endif
v8::Global<v8::Value> pinned_;
DISALLOW_COPY_AND_ASSIGN(PowerMonitor); DISALLOW_COPY_AND_ASSIGN(PowerMonitor);
}; };

22
shell/browser/api/electron_api_power_monitor_win.cc
View file

@ -9,6 +9,7 @@
#include "base/win/windows_types.h" #include "base/win/windows_types.h"
#include "base/win/wrapped_window_proc.h" #include "base/win/wrapped_window_proc.h"
#include "content/public/browser/browser_task_traits.h"
#include "ui/base/win/shell.h" #include "ui/base/win/shell.h"
#include "ui/gfx/win/hwnd_util.h" #include "ui/gfx/win/hwnd_util.h"
@ -81,16 +82,29 @@ LRESULT CALLBACK PowerMonitor::WndProc(HWND hwnd,
} }
if (should_treat_as_current_session) { if (should_treat_as_current_session) {
if (wparam == WTS_SESSION_LOCK) { if (wparam == WTS_SESSION_LOCK) {
Emit("lock-screen"); // Unretained is OK because this object is eternally pinned.
content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE,
base::BindOnce([](PowerMonitor* pm) { pm->Emit("lock-screen"); },
base::Unretained(this)));
} else if (wparam == WTS_SESSION_UNLOCK) { } else if (wparam == WTS_SESSION_UNLOCK) {
Emit("unlock-screen"); content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE,
base::BindOnce([](PowerMonitor* pm) { pm->Emit("unlock-screen"); },
base::Unretained(this)));
} }
} }
} else if (message == WM_POWERBROADCAST) { } else if (message == WM_POWERBROADCAST) {
if (wparam == PBT_APMRESUMEAUTOMATIC) { if (wparam == PBT_APMRESUMEAUTOMATIC) {
Emit("resume"); content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE,
base::BindOnce([](PowerMonitor* pm) { pm->Emit("resume"); },
base::Unretained(this)));
} else if (wparam == PBT_APMSUSPEND) { } else if (wparam == PBT_APMSUSPEND) {
Emit("suspend"); content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE,
base::BindOnce([](PowerMonitor* pm) { pm->Emit("suspend"); },
base::Unretained(this)));
} }
} }
return ::DefWindowProc(hwnd, message, wparam, lparam); return ::DefWindowProc(hwnd, message, wparam, lparam);