Make the Linux System Monitor implementation track all devices

chrome/browser/media_gallery/media_storage_util.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.
 
 // chrome::MediaStorageUtil implementation.
 
 #include "chrome/browser/media_gallery/media_storage_util.h"
 
 #include <vector>
 
@@ skipping 84 matching lines @@
       return std::string(kUsbMtpPrefix) + unique_id;
   }
   NOTREACHED();
   return std::string();
 }
 
 // static
 bool MediaStorageUtil::CrackDeviceId(const std::string& device_id,
                                      Type* type, std::string* unique_id) {
   size_t prefix_length = device_id.find_first_of(':');
-  std::string prefix = device_id.substr(0, prefix_length);
+  std::string prefix = device_id.substr(0, prefix_length + 1);

[Lei Zhang, 2012/08/27 23:17:15]

You'll need to sync past r153569 and resolve this.

[vandebo (ex-Chrome), 2012/08/27 23:31:11]

Done.

 
   Type found_type;
   if (prefix == kUsbMassStorageWithDCIMPrefix) {
     found_type = USB_MASS_STORAGE_WITH_DCIM;
   } else if (prefix == kUsbMassStorageNoDCIMPrefix) {
     found_type = USB_MASS_STORAGE_NO_DCIM;
   } else if (prefix == kOtherMassStoragePrefix) {
     found_type = OTHER_MASS_STORAGE;
   } else if (prefix == kUsbMtpPrefix) {
     found_type = USB_MTP;
@@ skipping 32 matching lines @@
     return;
   }
 
   switch (type) {
     case USB_MTP:  // Fall through
     case USB_MASS_STORAGE_WITH_DCIM:
       // We should be able to find media devices in SystemMonitor.
       callback.Run(!FindRemovableStorageLocationById(device_id).empty());
       break;
     case USB_MASS_STORAGE_NO_DCIM:
-      FindUSBDeviceById(unique_id,
+      FindUSBDeviceById(device_id,
                         base::Bind(&EmptyPathIsFalseCallback, callback));
       break;
     case OTHER_MASS_STORAGE:
       // For this type, the unique_id is the path.
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&ValidatePathOnFileThread,
                      FilePath::FromUTF8Unsafe(unique_id),
                      base::Bind(&EmptyPathIsFalseCallback, callback)));
       break;
@@ skipping 25 matching lines @@
   Type type;
   std::string unique_id;
   if (!CrackDeviceId(device_id, &type, &unique_id))
     callback.Run(FilePath());
 
   switch (type) {
     case USB_MTP:
       callback.Run(FilePath());
       break;
     case USB_MASS_STORAGE_NO_DCIM:
-      FindUSBDeviceById(unique_id, callback);
+      FindUSBDeviceById(device_id, callback);
       break;
     case OTHER_MASS_STORAGE:
       // For this type, the unique_id is the path.
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&ValidatePathOnFileThread,
                      FilePath::FromUTF8Unsafe(unique_id), callback));
       break;
     case USB_MASS_STORAGE_WITH_DCIM:
       callback.Run(FilePath(FindRemovableStorageLocationById(device_id)));
       break;
   }
   NOTREACHED();
   callback.Run(FilePath());
 }
 
 MediaStorageUtil::MediaStorageUtil() {}
 
 // static
-void MediaStorageUtil::FindUSBDeviceById(const std::string& unique_id,
+void MediaStorageUtil::FindUSBDeviceById(const std::string& device_id,
                                          const FilePathCallback& callback) {
   // TODO(vandebo) This needs to be implemented per platform.
   // Type is USB_MASS_STORAGE_NO_DCIM, so it's a device possibly mounted
   // somewhere...
   NOTREACHED();
   callback.Run(FilePath());
 }
 
 }  // namespace chrome