Adding using protobuf based communication for the power information transfer.

chrome/browser/chromeos/dbus/power_manager_client.cc

 // Copyright (c) 2012 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"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/chromeos/dbus/power_supply_properties.pb.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
@@ skipping 147 matching lines @@
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         dbus::ObjectProxy::EmptyResponseCallback());
   }
 
   virtual void IncreaseScreenBrightness() OVERRIDE {
     SimpleMethodCallToPowerManager(power_manager::kIncreaseScreenBrightness);
   }
 
   virtual void RequestStatusUpdate(UpdateRequestType update_type) OVERRIDE {
-    dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
-                                 power_manager::kGetAllPropertiesMethod);
+    dbus::MethodCall method_call(
+        power_manager::kPowerManagerInterface,
+        power_manager::kGetPowerSupplyPropertiesMethod);
     power_manager_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&PowerManagerClientImpl::OnGetAllPropertiesMethod,
+        base::Bind(&PowerManagerClientImpl::OnGetPowerSupplyPropertiesMethod,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   virtual void RequestRestart() OVERRIDE {
     SimpleMethodCallToPowerManager(power_manager::kRequestRestartMethod);
   };
 
   virtual void RequestShutdown() OVERRIDE {
     SimpleMethodCallToPowerManager(power_manager::kRequestShutdownMethod);
   }
@@ skipping 112 matching lines @@
       FOR_EACH_OBSERVER(
           Observer, observers_, LockButtonStateChanged(down, timestamp));
     }
   }
 
   void PowerSupplyPollReceived(dbus::Signal* unused_signal) {
     VLOG(1) << "Received power supply poll signal.";
     RequestStatusUpdate(UPDATE_POLL);
   }
 
-  void OnGetAllPropertiesMethod(dbus::Response* response) {
+  void OnGetPowerSupplyPropertiesMethod(dbus::Response* response) {
     if (!response) {
-      LOG(ERROR) << "Error calling " << power_manager::kGetAllPropertiesMethod;
-      return;
-    }
-    dbus::MessageReader reader(response);
-    PowerSupplyStatus status;
-    double unused_battery_voltage = 0.0;
-    double unused_battery_energy = 0.0;
-    double unused_battery_energy_rate = 0.0;
-    if (!reader.PopBool(&status.line_power_on) ||
-        !reader.PopDouble(&unused_battery_energy) ||
-        !reader.PopDouble(&unused_battery_energy_rate) ||
-        !reader.PopDouble(&unused_battery_voltage) ||
-        !reader.PopInt64(&status.battery_seconds_to_empty) ||
-        !reader.PopInt64(&status.battery_seconds_to_full) ||
-        !reader.PopDouble(&status.battery_percentage) ||
-        !reader.PopBool(&status.battery_is_present) ||
-        !reader.PopBool(&status.battery_is_full)) {
-      LOG(ERROR) << "Error reading response from powerd: "
-                 << response->ToString();
+      LOG(ERROR) << "Error calling "
+                 << power_manager::kGetPowerSupplyPropertiesMethod;
       return;
     }
 
+    dbus::MessageReader reader(response);
+    PowerSupplyProperties protobuf;
+    reader.PopArrayOfBytesAsProto(&protobuf);
+
+    PowerSupplyStatus status;
+    status.line_power_on = protobuf.line_power_on();
+    status.battery_seconds_to_empty = protobuf.battery_time_to_empty();
+    status.battery_seconds_to_full = protobuf.battery_time_to_full();
+    status.battery_percentage = protobuf.battery_percentage();
+    status.battery_is_present = protobuf.battery_is_present();
+    status.battery_is_full = protobuf.battery_is_charged();
+
     VLOG(1) << "Power status: " << status.ToString();
     FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(status));
   }
 
   void OnGetIdleTime(const CalculateIdleTimeCallback& callback,
                      dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Error calling " << power_manager::kGetIdleTime;
       return;
     }
@@ skipping 185 matching lines @@
 
 PowerManagerClient* PowerManagerClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new PowerManagerClientImpl(bus);
   } else {
     return new PowerManagerClientStubImpl();
   }
 }
 
 }  // namespace chromeos