Use mounted device label as name in media device notification message.

chrome/browser/media_gallery/media_device_notifications_chromeos.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.
 
 // chromeos::MediaDeviceNotifications implementation.
 
 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/media_gallery/media_device_notifications_utils.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 namespace {
 
-std::string GetDeviceUuid(const std::string& source_path) {
-  // Get the media device uuid if exists.
+void GetDeviceInfo(const std::string& source_path, std::string* device_id_str,

[Lei Zhang, 2012/08/03 05:45:25]

|device_id_str| -> |device_id| here and below.

[kmadhusu, 2012/08/03 06:07:11]

Done.

+                   string16* device_label) {
+  // Get the media device uuid and label if exists.
   const disks::DiskMountManager::DiskMap& disks =
       disks::DiskMountManager::GetInstance()->disks();
   disks::DiskMountManager::DiskMap::const_iterator it = disks.find(source_path);
-  return it == disks.end() ? std::string() : it->second->fs_uuid();
+  if (it == disks.end())
+    return;

[Lei Zhang, 2012/08/03 05:45:25]

May want to return bool, so the caller knows |device_id_str| is not empty on
accident.

[kmadhusu, 2012/08/03 06:07:11]

Done.

+
+  const disks::DiskMountManager::Disk& disk = *(it->second);
+  *device_id_str = disk.fs_uuid();
+
+  // TODO(kmadhusu): If device label is empty, extract vendor and model details
+  // and use them as device_label.
+  *device_label = disk.device_label().empty() ?

[Lei Zhang, 2012/08/03 05:45:25]

Would UTF8ToUTF16(foo ? bar : qux) be better?

[kmadhusu, 2012/08/03 06:07:11]

Done.

+                  UTF8ToUTF16(FilePath(source_path).BaseName().value()) :
+                  UTF8ToUTF16(disk.device_label());
 }
 
 }  // namespace
 
 using content::BrowserThread;
 
 MediaDeviceNotifications::MediaDeviceNotifications() {
   DCHECK(disks::DiskMountManager::GetInstance());
   disks::DiskMountManager::GetInstance()->AddObserver(this);
 }
@@ skipping 69 matching lines @@
 
 void MediaDeviceNotifications::AddMountedPathOnUIThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (ContainsKey(mount_map_, mount_info.mount_path)) {
     NOTREACHED();
     return;
   }
 
-  // Get the media device uuid if exists.
-  std::string device_id_str = GetDeviceUuid(mount_info.source_path);
+  // Get the media device uuid and label if exists.
+  std::string device_id_str;
+  string16 device_label;
+  GetDeviceInfo(mount_info.source_path, &device_id_str, &device_label);
 
   // Keep track of device uuid, to see how often we receive empty uuid values.
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.device_uuid_available",
                         !device_id_str.empty());
   if (device_id_str.empty())
     return;
 
   mount_map_.insert(std::make_pair(mount_info.mount_path, device_id_str));
   base::SystemMonitor::Get()->ProcessMediaDeviceAttached(
       device_id_str,
-      UTF8ToUTF16(FilePath(mount_info.source_path).BaseName().value()),
+      device_label,
       base::SystemMonitor::TYPE_PATH,
       mount_info.mount_path);
 }
 
 }  // namespace chrome