chromeos: call GetIdleTime from 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 135 matching lines @@
   // Requests shutdown of the system.
   virtual void RequestShutdown() OVERRIDE {
     dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
                                  power_manager::kRequestShutdownMethod);
     power_manager_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         dbus::ObjectProxy::EmptyResponseCallback());
   }
 
+  virtual void CalculateIdleTime(const CalculateIdleTimeCallback& callback)
+      OVERRIDE {
+    dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
+                                 power_manager::kGetIdleTime);
+    power_manager_proxy_->CallMethod(
+        &method_call,
+        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&PowerManagerClientImpl::OnGetIdleTime,
+                   weak_ptr_factory_.GetWeakPtr(), callback));
+  }
 
  private:
   // Called when a dbus signal is initially connected.
   void SignalConnected(const std::string& interface_name,
                        const std::string& signal_name,
                        bool success) {
     LOG_IF(WARNING, !success) << "Failed to connect to signal "
                               << signal_name << ".";
   }
 
@@ skipping 60 matching lines @@
         !reader.PopBool(&status.battery_is_full)) {
       LOG(ERROR) << "Error reading response from powerd: "
                  << response->ToString();
       return;
     }
 
     VLOG(1) << "Power status: " << status.ToString();
     FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(status));
   }
 
+  void OnGetIdleTime(const CalculateIdleTimeCallback& callback,
+                     dbus::Response* response) {

[satorux1, 2011/11/15 02:07:12]

Please add something like:

if (!response) {
  LOG(ERROR) << "Error calling " << power_manager::kGetIdleTime;
  callback.Run(-1);
  return;
}

[Simon Que, 2011/11/15 02:47:44]

Done.

+    dbus::MessageReader reader(response);
+    int64 idle_time_ms = 0;
+    if (!reader.PopInt64(&idle_time_ms)) {
+      LOG(ERROR) << "Error reading response from powerd: "
+                 << response->ToString();
+      return;
+    }
+    if (idle_time_ms >= 0) {
+      callback.Run(idle_time_ms/1000);
+    } else {
+      LOG(ERROR) << "Power manager failed to calculate idle time.";
+      callback.Run(-1);
+    }
+  }
+
   dbus::ObjectProxy* power_manager_proxy_;
   ObserverList<Observer> observers_;
   base::WeakPtrFactory<PowerManagerClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerManagerClientImpl);
 };
 
 // The PowerManagerClient implementation used on Linux desktop,
 // which does nothing.
 class PowerManagerClientStubImpl : public PowerManagerClient {
@@ skipping 35 matching lines @@
           &PowerManagerClientStubImpl::Update);
     } else {
       timer_.Stop();
     }
   }
 
   virtual void RequestRestart() OVERRIDE {}
 
   virtual void RequestShutdown() OVERRIDE {}
 
+  virtual void CalculateIdleTime(const CalculateIdleTimeCallback& callback)
+      OVERRIDE {

[satorux1, 2011/11/15 02:07:12]

Please call callback.Run(0) to keep compatibility with the behavior in
PowerLibrary.

[Simon Que, 2011/11/15 02:47:44]

Done.

+  }
+
  private:
   void Update() {
     // We pause at 0 and 100% so that it's easier to check those conditions.
     if (pause_count_ > 1) {
       pause_count_--;
       return;
     }
 
     if (battery_percentage_ == 0 || battery_percentage_ == 100) {
       if (pause_count_) {
@@ skipping 33 matching lines @@
 
 PowerManagerClient* PowerManagerClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new PowerManagerClientImpl(bus);
   } else {
     return new PowerManagerClientStubImpl();
   }
 }
 
 }  // namespace chromeos