[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/storage_info.h

 // Copyright 2014 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 COMPONENTS_STORAGE_MONITOR_STORAGE_INFO_H_
 #define COMPONENTS_STORAGE_MONITOR_STORAGE_INFO_H_
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 
@@ skipping 16 matching lines @@
     ITUNES,
     // A Picasa database.
     PICASA,
     // An iPhoto library.
     IPHOTO,
   };
 
   StorageInfo();
   // Note: |device_id_in| should be constructed with MakeDeviceId.
   StorageInfo(const std::string& device_id_in,
-              const base::string16& device_name,
               const base::FilePath::StringType& device_location,
               const base::string16& label,
               const base::string16& vendor,
               const base::string16& model,
               uint64 size_in_bytes);
   ~StorageInfo();
 
   // Returns a device id given properties of the device. A prefix dependent on
   // |type| is added so |unique_id| need only be unique within the given type.
   // Returns an empty string if an invalid type is passed in.
@@ skipping 15 matching lines @@
   // Looks inside |device_id| to determine if it is a mass storage device
   // (type isn't MTP_OR_PTP).
   static bool IsMassStorageDevice(const std::string& device_id);
 
   static bool IsITunesDevice(const std::string& device_id);
 
   static bool IsPicasaDevice(const std::string& device_id);
 
   static bool IsIPhotoDevice(const std::string& device_id);
 
+  // Get the display name for the removable device represented by this
+  // StorageInfo. Include the size for removable devices if |with_size| is true.
+  base::string16 GetDisplayName(bool with_size) const;
+
+  // Same as GetDisplayName(), but may be overridden by |override_display_name|.
+  base::string16 GetDisplayNameWithOverride(
+      const base::string16& override_display_name, bool with_size) const;
+
   const std::string& device_id() const { return device_id_; }
-  const base::string16& name() const { return name_; }
   const base::FilePath::StringType& location() const { return location_; }
   const base::string16& storage_label() const { return storage_label_; }
   const base::string16& vendor_name() const { return vendor_name_; }
   const base::string16& model_name() const { return model_name_; }
   uint64 total_size_in_bytes() const { return total_size_in_bytes_; }
 
   void set_device_id(const std::string& device_id) { device_id_ = device_id; }
-  void set_name(const base::string16& name) { name_ = name; }
   void set_location(const base::FilePath::StringType& location) {
     location_ = location;
   }
 
  private:
   // Unique device id - persists between device attachments.
   // This is the string that should be used as the label for a particular
   // storage device when interacting with the API. Clients should treat
   // this as an opaque string.
   std::string device_id_;
 
-  // Human readable removable storage device name.
-  base::string16 name_;
-
   // Current attached removable storage device location.
   base::FilePath::StringType location_;
 
   // Label given to this storage device by the user.
   // May be empty if not found or the device is unlabeled.
   base::string16 storage_label_;
 
   // Vendor name for the removable device. (Human readable)
   // May be empty if not collected.
   base::string16 vendor_name_;
 
   // Model name for the removable device. (Human readable)
   // May be empty if not collected.
   base::string16 model_name_;
 
   // Size of the removable device in bytes.
   // Zero if not collected or unknown.
   uint64 total_size_in_bytes_;
 };
 
 }  // namespace storage_monitor
 
 #endif  // COMPONENTS_STORAGE_MONITOR_STORAGE_INFO_H_