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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/event_router.h

Issue 22264004: Remove ConnectivityStateHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove redundant IsConnected() check Created 7 years, 4 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_manager/event_router.h
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
index 24b6ca9e45e88cb85af99824d4612ec6391f3ea8..55b72cebc9df9a6b87f3c66bec309ffaff0dec90 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -14,13 +14,17 @@
#include "chrome/browser/chromeos/drive/file_system_observer.h"
#include "chrome/browser/chromeos/drive/job_list.h"
#include "chrome/browser/chromeos/extensions/file_manager/file_watcher.h"
-#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
#include "chrome/browser/drive/drive_service_interface.h"
#include "chromeos/disks/disk_mount_manager.h"
+#include "chromeos/network/network_state_handler_observer.h"
class PrefChangeRegistrar;
class Profile;
+namespace chromeos {
+class NetworkState;
+}
+
namespace file_manager {
class DesktopNotifications;
@@ -30,7 +34,7 @@ class MountedDiskMonitor;
// affecting File Manager. Dispatches appropriate File Browser events.
class EventRouter
: public chromeos::disks::DiskMountManager::Observer,
- public chromeos::ConnectivityStateHelperObserver,
+ public chromeos::NetworkStateHandlerObserver,
public drive::DriveIntegrationServiceObserver,
public drive::FileSystemObserver,
public drive::JobListObserver,
@@ -77,9 +81,10 @@ class EventRouter
chromeos::FormatError error_code,
const std::string& device_path) OVERRIDE;
- // chromeos::ConnectivityStateHelperObserver override.
+ // chromeos::NetworkStateHandlerObserver overrides.
virtual void NetworkManagerChanged() OVERRIDE;
- virtual void DefaultNetworkChanged() OVERRIDE;
+ virtual void DefaultNetworkChanged(
+ const chromeos::NetworkState* network) OVERRIDE;
// drive::JobListObserver overrides.
virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698