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

fixup! Implement powerMonitor 'shutdown' event for Linux

Browse source
This commit is contained in:
Thiago de Arruda 2017-12-21 07:49:54 -03:00 • committed by Cheng Zhao
parent 45763c0afb
commit f0e210360f
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/lib/power_observer_linux.cc
View file

@ -70,10 +70,10 @@ void PowerObserverLinux::OnLoginServiceAvailable(bool service_available) {
base::Bind(&PowerObserverLinux::OnSignalConnected, base::Bind(&PowerObserverLinux::OnSignalConnected,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
// Take sleep inhibit lock // Take sleep inhibit lock
TakeSleepLock(); BlockSleep();
} }
void PowerObserverLinux::TakeSleepLock() { void PowerObserverLinux::BlockSleep() {
dbus::MethodCall sleep_inhibit_call(kLogindManagerInterface, "Inhibit"); dbus::MethodCall sleep_inhibit_call(kLogindManagerInterface, "Inhibit");
dbus::MessageWriter inhibit_writer(&sleep_inhibit_call); dbus::MessageWriter inhibit_writer(&sleep_inhibit_call);
inhibit_writer.AppendString("sleep"); // what inhibit_writer.AppendString("sleep"); // what
@ -88,6 +88,10 @@ void PowerObserverLinux::TakeSleepLock() {
weak_ptr_factory_.GetWeakPtr(), &sleep_lock_)); weak_ptr_factory_.GetWeakPtr(), &sleep_lock_));
} }
void PowerObserverLinux::UnblockSleep() {
sleep_lock_.reset();
}
void PowerObserverLinux::BlockShutdown() { void PowerObserverLinux::BlockShutdown() {
if (shutdown_lock.is_valid()) { if (shutdown_lock.is_valid()) {
LOG(WARNING) << "Trying to subscribe to shutdown multiple times"; LOG(WARNING) << "Trying to subscribe to shutdown multiple times";
@ -129,9 +133,9 @@ void PowerObserverLinux::OnPrepareForSleep(dbus::Signal* signal) {
} }
if (suspending) { if (suspending) {
OnSuspend(); OnSuspend();
sleep_lock_.reset(); UnblockSleep();
} else { } else {
TakeSleepLock(); BlockSleep();
OnResume(); OnResume();
} }
} }

3
atom/browser/lib/power_observer_linux.h
View file

@ -20,12 +20,13 @@ class PowerObserverLinux : public base::PowerObserver {
public: public:
PowerObserverLinux(); PowerObserverLinux();
void BlockSleep();
void UnblockSleep();
void BlockShutdown(); void BlockShutdown();
void UnblockShutdown(); void UnblockShutdown();
virtual bool OnShutdown() { return false; } virtual bool OnShutdown() { return false; }
private: private:
void TakeSleepLock();
void OnLoginServiceAvailable(bool available); void OnLoginServiceAvailable(bool available);
void OnInhibitResponse(base::ScopedFD* scoped_fd, dbus::Response* response); void OnInhibitResponse(base::ScopedFD* scoped_fd, dbus::Response* response);
void OnPrepareForSleep(dbus::Signal* signal); void OnPrepareForSleep(dbus::Signal* signal);