chromeos: Move system resume handling to power manager client

chrome/browser/chromeos/dbus/power_manager_client.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 65 matching lines @@
                    weak_ptr_factory_.GetWeakPtr()));
 
     // Monitor the D-Bus signal for power supply polling signals.
     power_manager_proxy_->ConnectToSignal(
         power_manager::kPowerManagerInterface,
         power_manager::kPowerSupplyPollSignal,
         base::Bind(&PowerManagerClientImpl::PowerSupplyPollReceived,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&PowerManagerClientImpl::SignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
+
+    // Monitor the D-Bus signal for power state changed signals.
+    power_manager_proxy_->ConnectToSignal(
+        power_manager::kPowerManagerInterface,
+        power_manager::kPowerStateChangedSignal,
+        base::Bind(&PowerManagerClientImpl::PowerStateChangedSignalReceived,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&PowerManagerClientImpl::SignalConnected,
+                   weak_ptr_factory_.GetWeakPtr()));
   }
 
   virtual ~PowerManagerClientImpl() {
   }
 
   // PowerManagerClient override.
   virtual void AddObserver(Observer* observer) {
     observers_.AddObserver(observer);
   }
 
@@ skipping 108 matching lines @@
 
   // Called when a response for IncreaseScreenBrightness() is received.
   void OnIncreaseScreenBrightness(dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Failed to increase screen brightness";
       return;
     }
     VLOG(1) << "screen brightness increased: " << response->ToString();
   }
 
+  // Called when a power state changed signal is received.
+  void PowerStateChangedSignalReceived(dbus::Signal* signal) {
+    VLOG(1) << "Received power state changed signal.";
+    dbus::MessageReader reader(signal);
+    std::string arg;

[satorux1, 2011/11/23 01:03:27]

arg -> something more descriptive, like power_state_string.

[Simon Que, 2011/11/23 19:24:17]

Done.

+    if (!reader.PopString(&arg)) {
+      LOG(ERROR) << "Error reading signal args: " << signal->ToString();
+      return;
+    }
+    if (arg != "on")
+      return;
+    // Notify all observers of resume event.
+    FOR_EACH_OBSERVER(Observer, observers_, SystemResumed());
+  }
+
   // Called when a power supply polling signal is received.
   void PowerSupplyPollReceived(dbus::Signal* unused_signal) {
     VLOG(1) << "Received power supply poll signal.";
     RequestStatusUpdate();
   }
 
   // Called when GetAllPropertiesMethod call is complete.
   void OnGetAllPropertiesMethod(dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Error calling " << power_manager::kGetAllPropertiesMethod;
@@ skipping 151 matching lines @@
 
 PowerManagerClient* PowerManagerClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new PowerManagerClientImpl(bus);
   } else {
     return new PowerManagerClientStubImpl();
   }
 }
 
 }  // namespace chromeos