Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2225)

Unified Diff: chrome/browser/chromeos/net/network_change_notifier_chromeos.cc

Issue 8271024: chromeos: Add power supply info reading capability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: removed #if 0 Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
index 50e09b750557d55471479f04430138b1eb5143f2..c6a8184b8aec4a4021068899044ac1ded7c7e66c 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
+++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
@@ -6,6 +6,7 @@
#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 {
@@ -67,9 +68,13 @@ NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
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(
@@ -91,9 +96,13 @@ NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
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(

Powered by Google App Engine
This is Rietveld 408576698