Media Galleries: Properly retrieve file names on MTP devices on Windows.

chrome/browser/media_galleries/win/mtp_device_operations_util.cc

 // Copyright (c) 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/media_galleries/win/mtp_device_operations_util.h"
 
 #include <portabledevice.h>
 
 #include <algorithm>
 
@@ skipping 84 matching lines @@
   // TODO(kmadhusu): |content_type| can be an image or audio or video or mixed
   // album. It is not clear whether an album is a collection of physical objects
   // or virtual objects. Investigate this in detail.
 
   // The root storage object describes its content type as
   // WPD_CONTENT_FUNCTIONAL_OBJECT.
   return (content_type == WPD_CONTENT_TYPE_FOLDER ||
           content_type == WPD_CONTENT_TYPE_FUNCTIONAL_OBJECT);
 }
 
-// Returns the friendly name of the object from the property key values
-// specified by the |properties_values|.
-base::string16 GetObjectName(IPortableDeviceValues* properties_values,
-                       bool is_directory) {
+// Returns the name of the object from |properties_values|. If the object has
+// no filename, try to use a friendly name instead. e.g. with MTP storage roots.
+base::string16 GetObjectName(IPortableDeviceValues* properties_values) {
   DCHECK(properties_values);
+  base::string16 result;
   base::win::ScopedCoMem<base::char16> buffer;
-  REFPROPERTYKEY key =
-      is_directory ? WPD_OBJECT_NAME : WPD_OBJECT_ORIGINAL_FILE_NAME;
-  HRESULT hr = properties_values->GetStringValue(key, &buffer);
-  base::string16 result;
+  HRESULT hr = properties_values->GetStringValue(WPD_OBJECT_ORIGINAL_FILE_NAME,
+                                                 &buffer);
+  if (FAILED(hr))
+    hr = properties_values->GetStringValue(WPD_OBJECT_NAME, &buffer);
   if (SUCCEEDED(hr))
     result.assign(buffer);
   return result;
 }
 
 // Gets the last modified time of the object from the property key values
 // specified by the |properties_values|. On success, returns true and fills in
 // |last_modified_time|.
 bool GetLastModifiedTime(IPortableDeviceValues* properties_values,
                          base::Time* last_modified_time) {
@@ skipping 76 matching lines @@
     return false;
 
   base::win::ScopedComPtr<IPortableDeviceValues> properties_values;
   hr = properties->GetValues(object_id.c_str(),
                              properties_to_read.get(),
                              properties_values.Receive());
   if (FAILED(hr))
     return false;
 
   *is_directory = IsDirectory(properties_values.get());
-  *name = GetObjectName(properties_values.get(), *is_directory);
+  *name = GetObjectName(properties_values.get());
   if (name->empty())
     return false;
 
   if (*is_directory) {
     // Directory entry does not have size and last modified date property key
     // values.
     *size = 0;
     *last_modified_time = base::Time();
     return true;
   }
@@ skipping 177 matching lines @@
       object_entries.empty())
     return base::string16();
   // TODO(thestig): This DCHECK can fail. Multiple MTP objects can have
   // the same name. Handle the situation gracefully. Refer to crbug.com/169930
   // for more details.
   DCHECK_EQ(1U, object_entries.size());
   return object_entries[0].object_id;
 }
 
 }  // namespace media_transfer_protocol