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

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: Rebased after http://codereview.chromium.org/8423077 Created 9 years, 1 month 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 44b560478fa8a001ac4e2da06eb76db8404d11a2..75e688a73f8652b90088469ea796f9abbc942929 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/public/browser/browser_thread.h"
using content::BrowserThread;
@@ -84,9 +85,9 @@ NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
lib->RemoveNetworkManagerObserver(this);
lib->RemoveObserverForAllNetworks(this);
- chromeos::PowerLibrary* power =
- chromeos::CrosLibrary::Get()->GetPowerLibrary();
- power->RemoveObserver(this);
+ chromeos::CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
+ chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
+ ->RemoveObserver(this);
}
void NetworkChangeNotifierChromeos::Init() {
@@ -94,7 +95,8 @@ void NetworkChangeNotifierChromeos::Init() {
chromeos::CrosLibrary::Get()->GetNetworkLibrary();
network_library->AddNetworkManagerObserver(this);
- chromeos::CrosLibrary::Get()->GetPowerLibrary()
+ chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
+ chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
->AddObserver(this);
UpdateNetworkState(network_library);

Powered by Google App Engine
This is Rietveld 408576698