[Media Gallery][ChromeOS] Improve device media gallery names.

chrome/browser/system_monitor/media_device_notifications_utils.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_device_notifications_utils.h"
 
 #include "base/file_util.h"
+#include "base/string16.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
 #if defined(OS_WIN)
 const wchar_t kDCIMDirName[] = L"DCIM";
 #else
 const char kDCIMDirName[] = "DCIM";
 #endif
 
 }  // namespace
 
 namespace chrome {
 
 bool IsMediaDevice(const FilePath::StringType& mount_point) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
   FilePath dcim_path(mount_point);
   FilePath::StringType dcim_dir = kDCIMDirName;
   if (!file_util::DirectoryExists(dcim_path.Append(dcim_dir))) {
     // Check for lowercase 'dcim' as well.
     FilePath dcim_path_lower(dcim_path.Append(StringToLowerASCII(dcim_dir)));
     if (!file_util::DirectoryExists(dcim_path_lower))
       return false;
   }
   return true;
 }
 
+std::string GetDeviceManufacturerName(const std::string& vendor_name,
+                                      const std::string& model_name) {
+  if (!vendor_name.empty() && !model_name.empty())

[Lei Zhang, 2012/11/12 07:46:56]

Do you think this will be a little better?

if (vendor_name.empty() && model_name.empty())
  return std::string();
std::string product_name;
if (vendor_name.empty())
  product_name = model_name;
else if (model_name.empty())
  product_name = vendor_name;
else
  product_name = vendor_name + ", " + model_name;
return "(" + product_name + ")";

[kmadhusu, 2012/11/12 19:56:56]

Sure. I tried to avoid the temp variable "product_name".

+    return "(" + vendor_name + ", " + model_name + ")";
+  else if (!vendor_name.empty())
+    return "(" + vendor_name + ")";
+  else if (!model_name.empty())
+    return "(" + model_name + ")";
+  else
+    return std::string();
+}
+
+string16 GetDisplayNameForDevice(const string16& device_partition_size,
+                                 const string16& name) {
+  DCHECK(!name.empty());
+  return device_partition_size.empty() ?
+      name : device_partition_size + ASCIIToUTF16(" ") + name;
+}
+
 }  // namespace chrome