Refine StorageMonitor storage device getter

chrome/browser/storage_monitor/storage_monitor.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_STORAGE_MONITOR_STORAGE_MONITOR_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 49 matching lines @@
     EJECT_FAILURE
   };
 
   // Returns a pointer to an object owned by the BrowserMainParts, with lifetime
   // somewhat shorter than a process Singleton.
   static StorageMonitor* GetInstance();
 
   // Initialize the storage monitor. The provided callback, if non-null,
   // will be called when initialization is complete. If initialization has
   // already completed, this callback will be invoked within the calling stack.
-  // Before the callback is run, calls to |GetAttachedStorage| and
+  // Before the callback is run, calls to |GetAllAvailableStorages| and
   // |GetStorageInfoForPath| may not return the correct results. In addition,
   // registered observers will not be notified on device attachment/detachment.
   // Should be invoked on the UI thread; callbacks will be run on the UI thread.
   void Initialize(base::Closure callback);
 
   // Return true if the storage monitor has already been initialized.
   bool IsInitialized();
 
   // Finds the device that contains |path| and populates |device_info|.
   // Should be able to handle any path on the local system, not just removable
@@ skipping 14 matching lines @@
       const std::string& storage_device_id,
       string16* device_location,
       string16* storage_object_id) const = 0;
 #endif
 
 #if defined(OS_LINUX)
   virtual device::MediaTransferProtocolManager*
       media_transfer_protocol_manager() = 0;
 #endif
 
-  // Returns information for attached removable storage.
-  std::vector<StorageInfo> GetAttachedStorage() const;
+  // Returns information for all known storages on the system,
+  // including fixed and removable storages.
+  std::vector<StorageInfo> GetAllAvailableStorages() const;
 
   void AddObserver(RemovableStorageObserver* obs);
   void RemoveObserver(RemovableStorageObserver* obs);
 
   std::string GetTransientIdForDeviceId(const std::string& device_id);
   std::string GetDeviceIdForTransientId(const std::string& transient_id) const;
 
   virtual void EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback);
@@ skipping 19 matching lines @@
 
   // Called by subclasses to mark the storage monitor as
   // fully initialized. Must be called on the UI thread.
   void MarkInitialized();
 
  private:
   class ReceiverImpl;
   friend class ReceiverImpl;
 
   // Key: device id.
-  typedef std::map<std::string, StorageInfo> RemovableStorageMap;
+  typedef std::map<std::string, StorageInfo> AllAvailableStorageMap;

[Hongbo Min, 2013/06/04 02:52:29]

StorageMap might be a better name.

[Haojian Wu, 2013/06/04 03:52:09]

Done.

 
   void ProcessAttach(const StorageInfo& storage);
   void ProcessDetach(const std::string& id);
 
   scoped_ptr<Receiver> receiver_;
 
   scoped_refptr<ObserverListThreadSafe<RemovableStorageObserver> >
       observer_list_;
 
   bool initialized_;
   std::vector<base::Closure> on_initialize_callbacks_;
 
   // For manipulating removable_storage_map_ structure.
   mutable base::Lock storage_lock_;
 
   // Map of all the attached removable storage devices.
-  RemovableStorageMap storage_map_;
+  AllAvailableStorageMap storage_map_;
 
   scoped_ptr<TransientDeviceIds> transient_device_ids_;
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_