Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/extensions/api/system_storage/storage_info_provider.cc

 // Copyright 2013 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/extensions/api/system_storage/storage_info_provider.h"
 
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace extensions {
 
 using content::BrowserThread;
 using chrome::StorageMonitor;
 using api::system_storage::StorageUnitInfo;
 using api::system_storage::STORAGE_UNIT_TYPE_FIXED;
 using api::system_storage::STORAGE_UNIT_TYPE_REMOVABLE;
 
 namespace systeminfo {
 
 void BuildStorageUnitInfo(const chrome::StorageInfo& info,
                           StorageUnitInfo* unit) {
   unit->id = StorageMonitor::GetInstance()->GetTransientIdForDeviceId(
                  info.device_id());
-  unit->name = UTF16ToUTF8(info.name());
-  // TODO(hmin): Might need to take MTP device into consideration.
-  unit->type = chrome::StorageInfo::IsRemovableDevice(info.device_id()) ?
-      STORAGE_UNIT_TYPE_REMOVABLE : STORAGE_UNIT_TYPE_FIXED;
   unit->capacity = static_cast<double>(info.total_size_in_bytes());
+
+  if (chrome::StorageInfo::IsRemovableDevice(info.device_id())) {
+    // TODO(hmin): Might need to take MTP device into consideration.
+    unit->name = base::UTF16ToUTF8(info.GetDisplayName(false));
+    unit->type = STORAGE_UNIT_TYPE_REMOVABLE;
+  } else {
+    unit->name = base::UTF16ToUTF8(info.storage_label());
+    unit->type = STORAGE_UNIT_TYPE_FIXED;
+  }
 }
 
 }  // namespace systeminfo
 
 // Static member intialization.
 base::LazyInstance<scoped_refptr<StorageInfoProvider> >
     StorageInfoProvider::provider_ = LAZY_INSTANCE_INITIALIZER;
 
 StorageInfoProvider::StorageInfoProvider() {
 }
@@ skipping 46 matching lines @@
 }
 
 // static
 StorageInfoProvider* StorageInfoProvider::Get() {
   if (provider_.Get().get() == NULL)
     provider_.Get() = new StorageInfoProvider();
   return provider_.Get();
 }
 
 }  // namespace extensions