Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/imageburner/burn_manager.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_IMAGEBURNER_BURN_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_IMAGEBURNER_BURN_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/cros/burn_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/imageburner/burn_device_handler.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace net {
 class URLFetcher;
 }  // namespace net
 
 namespace chromeos {
 namespace imageburner {
@@ skipping 142 matching lines @@
 //   4-1) Unzip the fetched image file.
 //   4-2) Unmount the device from file system.
 //   4-3) Copy the unzipped file to the device directly.
 // Currently, this only provides some methods to start/cancel background tasks,
 // and some accessors to obtain the current status. Other functions are
 // distributed among BurnController and BurnLibrary.
 // TODO(hidehiko): Simplify the relationship among this class, BurnLibrary,
 // BurnController and helper classes defined above.
 class BurnManager : public net::URLFetcherDelegate,
                     public BurnLibrary::Observer,
-                    public NetworkLibrary::NetworkManagerObserver {
+                    public ConnectivityStateHelperObserver {
  public:
 
   // Interface for classes that need to observe events for the burning image
   // tasks.
   class Observer {
    public:
     // Triggered when a burnable device is added.
     virtual void OnDeviceAdded(const disks::DiskMountManager::Disk& disk) = 0;
 
     // Triggered when a burnable device is removed.
@@ skipping 92 matching lines @@
 
   // Cancel fetching image.
   void CancelImageFetch();
 
   // URLFetcherDelegate overrides:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                           int64 current,
                                           int64 total) OVERRIDE;
 
-  // BurnLibrary::Observer orverrides.
+  // BurnLibrary::Observer overrides.
   virtual void BurnProgressUpdated(BurnLibrary* object,
                                    BurnEvent event,
                                    const ImageBurnStatus& status) OVERRIDE;
 
-  // NetworkLibrary::NetworkManagerObserver interface.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE;
+  // ConnectivityStateHelperObserver override.
+  virtual void NetworkManagerChanged() OVERRIDE;
 
   // Creates directory image will be downloaded to.
   // Must be called from FILE thread.
   void CreateImageDir();
 
   // Returns directory image should be dopwnloaded to.
   // The directory has to be previously created.
   const base::FilePath& GetImageDir();
 
   const base::FilePath& target_device_path() { return target_device_path_; }
@@ skipping 50 matching lines @@
   base::WeakPtrFactory<BurnManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BurnManager);
 };
 
 }  // namespace imageburner
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_IMAGEBURNER_BURN_MANAGER_H_