[Media Galleries] Populate volume metadata in ChromeOS/Linux

chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.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/system_monitor/media_transfer_protocol_device_observer_linux.h"
 
 #include "base/file_path.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 95 matching lines @@
 
   if (!storage_info)
     return;
 
   if (id)
     *id = GetDeviceIdFromStorageInfo(*storage_info);
 
   if (label)
     *label = GetDeviceLabelFromStorageInfo(*storage_info);
 
-
   if (location)
     *location = GetDeviceLocationFromStorageName(storage_name);
 }
 
 }  // namespace
 
 MediaTransferProtocolDeviceObserverLinux::
 MediaTransferProtocolDeviceObserverLinux()
     : get_storage_info_func_(&GetStorageInfo) {
   DCHECK(!g_mtp_device_observer);
@@ skipping 80 matching lines @@
     // Keep track of device id and device name to see how often we receive
     // empty values.
     MediaStorageUtil::RecordDeviceInfoHistogram(false, device_id, device_name);
     if (device_id.empty() || device_name.empty())
       return;
 
     DCHECK(!ContainsKey(storage_map_, location));
 
     RemovableStorageNotifications::StorageInfo storage_info(
         device_id, device_name, location);
+    storage_info.storage_label = device_name;
     storage_map_[location] = storage_info;
-    notifications_->ProcessAttach(device_id, device_name, location);
+    notifications_->ProcessAttach(storage_info);
   } else {
     // Existing storage is detached.
     StorageLocationToInfoMap::iterator it =
         storage_map_.find(GetDeviceLocationFromStorageName(storage_name));
     if (it == storage_map_.end())
       return;
     notifications_->ProcessDetach(it->second.device_id);
     storage_map_.erase(it);
   }
 }
 
 void MediaTransferProtocolDeviceObserverLinux::EnumerateStorages() {
   typedef std::vector<std::string> StorageList;
   device::MediaTransferProtocolManager* mtp_manager =
       device::MediaTransferProtocolManager::GetInstance();
   StorageList storages = mtp_manager->GetStorages();
   for (StorageList::const_iterator storage_iter = storages.begin();
        storage_iter != storages.end(); ++storage_iter) {
     StorageChanged(true, *storage_iter);
   }
 }
 
 }  // namespace chrome