chromeos: Add power supply info reading capability

chrome/browser/chromeos/net/network_change_notifier_chromeos.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/net/network_change_notifier_chromeos.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "content/browser/browser_thread.h"
 
 namespace {
 
 // Delay for online change notification reporting.
 const int kOnlineNotificationDelayMS = 500;
 const int kInitialNotificationCheckDelayMS = 1000;
 
 bool IsOnline(chromeos::ConnectionState state) {
   return state == chromeos::STATE_ONLINE ||
@@ skipping 41 matching lines @@
 
 NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
     : has_active_network_(false),
       connection_state_(chromeos::STATE_UNKNOWN),
       online_notification_task_(NULL) {
 
   chromeos::NetworkLibrary* net =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   net->AddNetworkManagerObserver(this);
 
-  chromeos::PowerLibrary* power =
+  chromeos::PowerLibrary* power_lib =
       chromeos::CrosLibrary::Get()->GetPowerLibrary();
-  power->AddObserver(this);
+  power_lib->AddObserver(this);
+
+  chromeos::PowerManagerClient* power_client =
+      chromeos::DBusThreadManager::Get()->power_manager_client();
+  power_client->AddObserver(this);
 
   UpdateNetworkState(net);
   BrowserThread::PostDelayedTask(
          BrowserThread::UI, FROM_HERE,
          base::Bind(
              &NetworkChangeNotifierChromeos::UpdateInitialState, this),
          kInitialNotificationCheckDelayMS);
 }
 
 NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
   if (online_notification_task_) {
     online_notification_task_->Cancel();
     online_notification_task_ = NULL;
   }
   if (!chromeos::CrosLibrary::Get())
     return;
   chromeos::NetworkLibrary* lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
 
-  chromeos::PowerLibrary* power =
+  chromeos::PowerLibrary* power_lib =
       chromeos::CrosLibrary::Get()->GetPowerLibrary();
-  power->RemoveObserver(this);
+  power_lib->RemoveObserver(this);
+
+  chromeos::PowerManagerClient* power_client =
+      chromeos::DBusThreadManager::Get()->power_manager_client();
+  power_client->RemoveObserver(this);
 }
 
 void NetworkChangeNotifierChromeos::PowerChanged(
     const PowerSupplyStatus& status) {
 }
 
 void NetworkChangeNotifierChromeos::SystemResumed() {
   // Force invalidation of various net resources on system resume.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ skipping 142 matching lines @@
 
 // static
 void NetworkChangeNotifierChromeos::UpdateInitialState(
     NetworkChangeNotifierChromeos* self) {
   chromeos::NetworkLibrary* net =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   self->UpdateNetworkState(net);
 }
 
 }  // namespace net