Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/media_galleries/media_galleries_preferences.cc

 // 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.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
 #include "chrome/common/extensions/permissions/permissions_data.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/text/bytes_formatting.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 using extensions::ExtensionPrefs;
 
 namespace chrome {
 
 namespace {
 
 // Pref key for the list of media gallery permissions.
@@ skipping 167 matching lines @@
   if (dict->GetString(kMediaGalleryIdKey, &string_id) &&
       base::StringToUint64(string_id, &out_permission->pref_id) &&
       dict->GetBoolean(kMediaGalleryHasPermissionKey,
                        &out_permission->has_permission)) {
     return true;
   }
   NOTREACHED();
   return false;
 }
 
-string16 GetDisplayNameForDevice(uint64 storage_size_in_bytes,
-                                 const string16& name) {
-  DCHECK(!name.empty());
-  return (storage_size_in_bytes == 0) ?
-      name : ui::FormatBytes(storage_size_in_bytes) + ASCIIToUTF16(" ") + name;
-}
-
 // For a device with |device_name| and a relative path |sub_folder|, construct
 // a display name. If |sub_folder| is empty, then just return |device_name|.
 string16 GetDisplayNameForSubFolder(const string16& device_name,
                                     const base::FilePath& sub_folder) {
   if (sub_folder.empty())
     return device_name;
   return (sub_folder.BaseName().LossyDisplayName() +
-          ASCIIToUTF16(" - ") +
+          base::ASCIIToUTF16(" - ") +
           device_name);
 }
 
-string16 GetFullProductName(const string16& vendor_name,
-                            const string16& model_name) {
-  if (vendor_name.empty() && model_name.empty())
-    return string16();
-
-  string16 product_name;
-  if (vendor_name.empty())
-    product_name = model_name;
-  else if (model_name.empty())
-    product_name = vendor_name;
-  else if (!vendor_name.empty() && !model_name.empty())
-    product_name = vendor_name + UTF8ToUTF16(", ") + model_name;
-
-  return product_name;
-}
-
 }  // namespace
 
 MediaGalleryPrefInfo::MediaGalleryPrefInfo()
     : pref_id(kInvalidMediaGalleryPrefId),
       type(kInvalidType),
       total_size_in_bytes(0),
       volume_metadata_valid(false),
       prefs_version(0) {
 }
 
 MediaGalleryPrefInfo::~MediaGalleryPrefInfo() {}
 
 base::FilePath MediaGalleryPrefInfo::AbsolutePath() const {
   base::FilePath base_path = MediaStorageUtil::FindDevicePathById(device_id);
   DCHECK(!path.IsAbsolute());
   return base_path.empty() ? base_path : base_path.Append(path);
 }
 
 string16 MediaGalleryPrefInfo::GetGalleryDisplayName() const {
   if (!StorageInfo::IsRemovableDevice(device_id)) {
     // For fixed storage, the name is the directory name, or, in the case
     // of a root directory, the root directory name.
     // TODO(gbillock): Using only the BaseName can lead to ambiguity. The
     // tooltip resolves it. Is that enough?
-    base::FilePath path = AbsolutePath();
+    base::FilePath abspath = AbsolutePath();
     if (!display_name.empty())
       return display_name;
-    if (path == path.DirName())
-      return path.LossyDisplayName();
-    return path.BaseName().LossyDisplayName();
+    if (abspath == abspath.DirName())
+      return abspath.LossyDisplayName();
+    return abspath.BaseName().LossyDisplayName();
   }
 
-  string16 name = display_name;
-  if (name.empty())
-    name = volume_label;
-  if (name.empty())
-    name = GetFullProductName(vendor_name, model_name);
-  if (name.empty())
-    name = l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_UNLABELED_DEVICE);
-
-  name = GetDisplayNameForDevice(total_size_in_bytes, name);
-
-  if (!path.empty())
-    name = GetDisplayNameForSubFolder(name, path);
-
-  return name;
+  StorageInfo info(device_id,
+                   MediaStorageUtil::FindDevicePathById(device_id).value(),
+                   volume_label, vendor_name, model_name, total_size_in_bytes);
+  base::string16 name = info.GetDisplayNameWithOverride(display_name, true);
+  return GetDisplayNameForSubFolder(name, path);
 }
 
 string16 MediaGalleryPrefInfo::GetGalleryTooltip() const {
   return AbsolutePath().LossyDisplayName();
 }
 
 string16 MediaGalleryPrefInfo::GetGalleryAdditionalDetails() const {
   string16 attached;
   if (StorageInfo::IsRemovableDevice(device_id)) {
     if (MediaStorageUtil::IsRemovableStorageAttached(device_id)) {
@@ skipping 60 matching lines @@
   };
 
   for (size_t i = 0; i < arraysize(kDirectoryKeys); ++i) {
     base::FilePath path;
     if (!PathService::Get(kDirectoryKeys[i], &path))
       continue;
 
     base::FilePath relative_path;
     StorageInfo info;
     if (MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path)) {
-      AddGalleryInternal(info.device_id(), info.name(), relative_path, false,
-                         info.storage_label(), info.vendor_name(),
+      AddGalleryInternal(info.device_id(), base::string16(), relative_path,
+                         false, info.storage_label(), info.vendor_name(),
                          info.model_name(), info.total_size_in_bytes(),
                          base::Time(), true, 2);
     }
   }
 }
 
 bool MediaGalleriesPreferences::UpdateDeviceIDForSingletonType(
     const std::string& device_id) {
   StorageInfo::Type singleton_type;
   if (!StorageInfo::CrackDeviceId(device_id, &singleton_type, NULL))
@@ skipping 547 matching lines @@
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   extension_prefs_for_testing_ = extension_prefs;
 }
 
 }  // namespace chrome