Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/extensions/file_browser_event_router.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/files/file_path_watcher.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
 #include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/operation_registry.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
 class FileBrowserNotifications;
 class PrefChangeRegistrar;
 class Profile;
 
 namespace drive {
 class DriveEntryProto;
 class DriveFileSystemInterface;
 }
 
 // Monitors changes in disk mounts, network connection state and preferences
 // affecting File Manager. Dispatches appropriate File Browser events.
 class FileBrowserEventRouter
     : public base::RefCountedThreadSafe<FileBrowserEventRouter>,
       public chromeos::disks::DiskMountManager::Observer,
-      public chromeos::NetworkLibrary::NetworkManagerObserver,
+      public chromeos::ConnectivityStateHelperObserver,
       public drive::DriveFileSystemObserver,
       public google_apis::DriveServiceObserver {
  public:
   // Interface that should keep track of the system state in regards to system
   // suspend and resume events.
   // When the |IsResuming()| returns true, it should be able to check if a
   // removable device was present before the was system suspended.
   class SuspendStateDelegate {
    public:
     virtual ~SuspendStateDelegate() {}
@@ skipping 32 matching lines @@
   virtual void OnMountEvent(
       chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
       OVERRIDE;
   virtual void OnFormatEvent(
       chromeos::disks::DiskMountManager::FormatEvent event,
       chromeos::FormatError error_code,
       const std::string& device_path) OVERRIDE;
 
-  // chromeos::NetworkLibrary::NetworkManagerObserver override.
-  virtual void OnNetworkManagerChanged(
-      chromeos::NetworkLibrary* network_library) OVERRIDE;
+  // chromeos::ConnectivityStateHelperObserver override.
+  virtual void NetworkManagerChanged() OVERRIDE;
 
   // drive::DriveServiceObserver overrides.
   virtual void OnProgressUpdate(
       const google_apis::OperationProgressStatusList& list) OVERRIDE;
   virtual void OnRefreshTokenInvalid() OVERRIDE;
 
   // drive::DriveFileSystemInterface::Observer overrides.
   virtual void OnDirectoryChanged(
       const base::FilePath& directory_path) OVERRIDE;
   virtual void OnResourceListFetched(int num_accumulated_entries) OVERRIDE;
@@ skipping 97 matching lines @@
   Profile* profile_;
   base::Lock lock_;
 
   // Number of active update requests on the remote file system.
   int num_remote_update_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(FileBrowserEventRouter);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_