diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 07:41:43 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 07:41:43 +0000 |
| commit | 48faf41000936e4ffcaa5a294097fc931b1a2781 (patch) | |
| tree | 775576f2989e78e883cccfede0ea585d2661920b /chromeos/disks | |
| parent | d2a639ea45a0e9e9d257c40db548f3cdeda7c383 (diff) | |
| download | chromium_src-48faf41000936e4ffcaa5a294097fc931b1a2781.zip chromium_src-48faf41000936e4ffcaa5a294097fc931b1a2781.tar.gz chromium_src-48faf41000936e4ffcaa5a294097fc931b1a2781.tar.bz2 | |
[Chrome OS] Construct device label and unique id using vendor and product details.
If the device uuid is unavailable, construct the unique id using vendor id and product id values.
If the device label is unavailable, construct the name using vendor and product names.
BUG=none
TEST=none
TBR=satorux@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10908277
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/disks')
| -rw-r--r-- | chromeos/disks/mock_disk_mount_manager.cc | 5 | ||||
| -rw-r--r-- | chromeos/disks/mock_disk_mount_manager.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chromeos/disks/mock_disk_mount_manager.cc b/chromeos/disks/mock_disk_mount_manager.cc index 610efbb..9af1651 100644 --- a/chromeos/disks/mock_disk_mount_manager.cc +++ b/chromeos/disks/mock_disk_mount_manager.cc @@ -182,12 +182,13 @@ void MockDiskMountManager::SetupDefaultReplies() { void MockDiskMountManager::CreateDiskEntryForMountDevice( const DiskMountManager::MountPointInfo& mount_info, - const std::string& device_id) { + const std::string& device_id, + const std::string& device_label) { Disk* disk = new DiskMountManager::Disk(std::string(mount_info.source_path), std::string(mount_info.mount_path), std::string(), // system_path std::string(), // file_path - std::string(), // device_label + device_label, // device_label std::string(), // drive_label std::string(), // vendor_id std::string(), // vendor_name diff --git a/chromeos/disks/mock_disk_mount_manager.h b/chromeos/disks/mock_disk_mount_manager.h index 169f33d..abe2459 100644 --- a/chromeos/disks/mock_disk_mount_manager.h +++ b/chromeos/disks/mock_disk_mount_manager.h @@ -49,13 +49,14 @@ class MockDiskMountManager : public DiskMountManager { void SetupDefaultReplies(); // Creates a fake disk entry for the mounted device. This function is - // primarily for MediaDeviceNotificationsTest. + // primarily for RemovableDeviceNotificationsTest. void CreateDiskEntryForMountDevice( const DiskMountManager::MountPointInfo& mount_info, - const std::string& device_id); + const std::string& device_id, + const std::string& device_label); // Removes the fake disk entry associated with the mounted device. This - // function is primarily for MediaDeviceNotificationsTest. + // function is primarily for RemovableDeviceNotificationsTest. void RemoveDiskEntryForMountDevice( const DiskMountManager::MountPointInfo& mount_info); |