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 |GetAttachedRemovableStorages| 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 the meta information for all available storages on the system,

[wrong vandebo, 2013/05/29 15:16:16]

We probably don't want to introduce a second method here.  We should just update
the description, name, and callers of the existing method.  StorageInfo contains
enough information to tell you if it is removable or not.

[Greg Billock, 2013/05/29 17:58:19]

We've discussed making the method return all known storages, instead of just
removable ones, and I think that is something we want to do. We need to get them
at this point, anyway.

+  // including fixed and removable storage. It may return an empty vector
+  // if the storage metadata retrieval is not completed yet.
+  virtual std::vector<StorageInfo> GetAllAvailableStorages() const;
+
   // Returns information for attached removable storage.
-  std::vector<StorageInfo> GetAttachedStorage() const;
+  std::vector<StorageInfo> GetAttachedRemovableStorages() 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 44 matching lines @@
 
   // Map of all the attached removable storage devices.
   RemovableStorageMap storage_map_;
 
   scoped_ptr<TransientDeviceIds> transient_device_ids_;
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_