refactor: ginify powerMonitor (#22751)

shell/browser/lib/power_observer.h

@@ -1,26 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef SHELL_BROWSER_LIB_POWER_OBSERVER_H_
-#define SHELL_BROWSER_LIB_POWER_OBSERVER_H_
-
-#include "base/macros.h"
-
-#if defined(OS_LINUX)
-#include "shell/browser/lib/power_observer_linux.h"
-#else
-#include "base/power_monitor/power_observer.h"
-#endif  // defined(OS_LINUX)
-
-namespace electron {
-
-#if defined(OS_LINUX)
-typedef PowerObserverLinux PowerObserver;
-#else
-typedef base::PowerObserver PowerObserver;
-#endif  // defined(OS_LINUX)
-
-}  // namespace electron
-
-#endif  // SHELL_BROWSER_LIB_POWER_OBSERVER_H_

shell/browser/lib/power_observer_linux.cc

@@ -9,6 +9,8 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/command_line.h"
+#include "base/files/file_path.h"
 #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
 
 namespace {
@@ -17,22 +19,19 @@ const char kLogindServiceName[] = "org.freedesktop.login1";
 const char kLogindObjectPath[] = "/org/freedesktop/login1";
 const char kLogindManagerInterface[] = "org.freedesktop.login1.Manager";
 
-std::string get_executable_basename() {
-  char buf[4096];
-  size_t buf_size = sizeof(buf);
-  std::string rv("electron");
-  if (!uv_exepath(buf, &buf_size)) {
-    rv = strrchr(static_cast<const char*>(buf), '/') + 1;
-  }
-  return rv;
+base::FilePath::StringType GetExecutableBaseName() {
+  return base::CommandLine::ForCurrentProcess()
+      ->GetProgram()
+      .BaseName()
+      .value();
 }
 
 }  // namespace
 
 namespace electron {
 
-PowerObserverLinux::PowerObserverLinux()
-    : lock_owner_name_(get_executable_basename()), weak_ptr_factory_(this) {
+PowerObserverLinux::PowerObserverLinux(base::PowerObserver* observer)
+    : observer_(observer), lock_owner_name_(GetExecutableBaseName()) {
   auto* bus = bluez::BluezDBusThreadManager::Get()->GetSystemBus();
   if (!bus) {
     LOG(WARNING) << "Failed to get system bus connection";
@@ -114,6 +113,15 @@ void PowerObserverLinux::UnblockShutdown() {
 }
 
 void PowerObserverLinux::SetShutdownHandler(base::Callback<bool()> handler) {
+  // In order to delay system shutdown when e.preventDefault() is invoked
+  // on a powerMonitor 'shutdown' event, we need an org.freedesktop.login1
+  // shutdown delay lock. For more details see the "Taking Delay Locks"
+  // section of https://www.freedesktop.org/wiki/Software/systemd/inhibit/
+  if (handler && !should_shutdown_) {
+    BlockShutdown();
+  } else if (!handler && should_shutdown_) {
+    UnblockShutdown();
+  }
   should_shutdown_ = std::move(handler);
 }
 
@@ -133,11 +141,13 @@ void PowerObserverLinux::OnPrepareForSleep(dbus::Signal* signal) {
     return;
   }
   if (suspending) {
-    OnSuspend();
+    observer_->OnSuspend();
+
     UnblockSleep();
   } else {
     BlockSleep();
-    OnResume();
+
+    observer_->OnResume();
   }
 }
 

shell/browser/lib/power_observer_linux.h

@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/power_monitor/power_observer.h"
@@ -16,20 +17,19 @@
 
 namespace electron {
 
-class PowerObserverLinux : public base::PowerObserver {
+class PowerObserverLinux {
  public:
-  PowerObserverLinux();
-  ~PowerObserverLinux() override;
+  explicit PowerObserverLinux(base::PowerObserver* observer);
+  ~PowerObserverLinux();
 
- protected:
+  void SetShutdownHandler(base::Callback<bool()> should_shutdown);
+
+ private:
   void BlockSleep();
   void UnblockSleep();
   void BlockShutdown();
   void UnblockShutdown();
 
-  void SetShutdownHandler(base::Callback<bool()> should_shutdown);
-
- private:
   void OnLoginServiceAvailable(bool available);
   void OnInhibitResponse(base::ScopedFD* scoped_fd, dbus::Response* response);
   void OnPrepareForSleep(dbus::Signal* signal);
@@ -38,13 +38,14 @@ class PowerObserverLinux : public base::PowerObserver {
                          const std::string& signal,
                          bool success);
 
-  base::Callback<bool()> should_shutdown_;
+  base::RepeatingCallback<bool()> should_shutdown_;
+  base::PowerObserver* observer_;
 
   scoped_refptr<dbus::ObjectProxy> logind_;
   std::string lock_owner_name_;
   base::ScopedFD sleep_lock_;
   base::ScopedFD shutdown_lock_;
-  base::WeakPtrFactory<PowerObserverLinux> weak_ptr_factory_;
+  base::WeakPtrFactory<PowerObserverLinux> weak_ptr_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(PowerObserverLinux);
 };