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

Unified Diff: chrome/browser/chromeos/extensions/file_browser_event_router.cc

Issue 12729002: Add a unified observer to replace NetworkManagerObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mobile_activator_unittest Created 7 years, 9 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/extensions/file_browser_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 47d690b24a7bbd16d372616dfbf73b984f0dc5c3..5004fdb6700ca54b6d056982f43cb45df5c9d77b 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/chromeos/login/base_login_display_host.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
#include "chrome/browser/extensions/event_names.h"
#include "chrome/browser/extensions/event_router.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -274,10 +275,8 @@ void FileBrowserEventRouter::Shutdown() {
chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
if (cros_library) {
- chromeos::NetworkLibrary* network_library =
- cros_library->GetNetworkLibrary();
- if (network_library)
- network_library->RemoveNetworkManagerObserver(this);
+ chromeos::ConnectivityStateHelper::Get()->
+ RemoveNetworkManagerObserver(this);
}
profile_ = NULL;
@@ -307,10 +306,7 @@ void FileBrowserEventRouter::ObserveFileSystemEvents() {
chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
if (cros_library) {
tbarzic 2013/03/11 23:12:31 Do we still have to check that cros_library is pre
gauravsh 2013/03/12 00:30:25 That's what I figured - this pattern is used in ma
- chromeos::NetworkLibrary* network_library =
- cros_library->GetNetworkLibrary();
- if (network_library)
- network_library->AddNetworkManagerObserver(this);
+ chromeos::ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this);
}
suspend_state_delegate_.reset(new SuspendStateDelegateImpl());
@@ -533,8 +529,7 @@ void FileBrowserEventRouter::OnFormatEvent(
}
}
-void FileBrowserEventRouter::OnNetworkManagerChanged(
- chromeos::NetworkLibrary* network_library) {
+void FileBrowserEventRouter::NetworkManagerChanged() {
if (!profile_ ||
!extensions::ExtensionSystem::Get(profile_)->event_router()) {
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698