OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // chrome::MediaStorageUtil implementation. | 5 // chrome::MediaStorageUtil implementation. |
6 | 6 |
7 #include "chrome/browser/media_gallery/media_storage_util.h" | 7 #include "chrome/browser/media_gallery/media_storage_util.h" |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 return std::string(kUsbMtpPrefix) + unique_id; | 95 return std::string(kUsbMtpPrefix) + unique_id; |
96 } | 96 } |
97 NOTREACHED(); | 97 NOTREACHED(); |
98 return std::string(); | 98 return std::string(); |
99 } | 99 } |
100 | 100 |
101 // static | 101 // static |
102 bool MediaStorageUtil::CrackDeviceId(const std::string& device_id, | 102 bool MediaStorageUtil::CrackDeviceId(const std::string& device_id, |
103 Type* type, std::string* unique_id) { | 103 Type* type, std::string* unique_id) { |
104 size_t prefix_length = device_id.find_first_of(':'); | 104 size_t prefix_length = device_id.find_first_of(':'); |
105 std::string prefix = device_id.substr(0, prefix_length); | 105 std::string prefix = prefix_length != std::string::npos ? |
| 106 device_id.substr(0, prefix_length + 1) : ""; |
106 | 107 |
107 Type found_type; | 108 Type found_type; |
108 if (prefix == kUsbMassStorageWithDCIMPrefix) { | 109 if (prefix == kUsbMassStorageWithDCIMPrefix) { |
109 found_type = USB_MASS_STORAGE_WITH_DCIM; | 110 found_type = USB_MASS_STORAGE_WITH_DCIM; |
110 } else if (prefix == kUsbMassStorageNoDCIMPrefix) { | 111 } else if (prefix == kUsbMassStorageNoDCIMPrefix) { |
111 found_type = USB_MASS_STORAGE_NO_DCIM; | 112 found_type = USB_MASS_STORAGE_NO_DCIM; |
112 } else if (prefix == kOtherMassStoragePrefix) { | 113 } else if (prefix == kOtherMassStoragePrefix) { |
113 found_type = OTHER_MASS_STORAGE; | 114 found_type = OTHER_MASS_STORAGE; |
114 } else if (prefix == kUsbMtpPrefix) { | 115 } else if (prefix == kUsbMtpPrefix) { |
115 found_type = USB_MTP; | 116 found_type = USB_MTP; |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 void MediaStorageUtil::FindUSBDeviceById(const std::string& unique_id, | 225 void MediaStorageUtil::FindUSBDeviceById(const std::string& unique_id, |
225 const FilePathCallback& callback) { | 226 const FilePathCallback& callback) { |
226 // TODO(vandebo) This needs to be implemented per platform. | 227 // TODO(vandebo) This needs to be implemented per platform. |
227 // Type is USB_MASS_STORAGE_NO_DCIM, so it's a device possibly mounted | 228 // Type is USB_MASS_STORAGE_NO_DCIM, so it's a device possibly mounted |
228 // somewhere... | 229 // somewhere... |
229 NOTREACHED(); | 230 NOTREACHED(); |
230 callback.Run(FilePath()); | 231 callback.Run(FilePath()); |
231 } | 232 } |
232 | 233 |
233 } // namespace chrome | 234 } // namespace chrome |
OLD | NEW |