Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media_gallery/media_storage_util.cc

Issue 10869067: Deliver attach intent to packaged apps (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: r Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/api/app_runtime/app_runtime_api.cc ('K') | « chrome/browser/extensions/platform_app_launcher.cc ('k') | chrome/browser/media_gallery/media_storage_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_gallery/media_storage_util.cc
diff --git a/chrome/browser/media_gallery/media_storage_util.cc b/chrome/browser/media_gallery/media_storage_util.cc
index 2379d70d3d98b573ea9e08a7f0cf4e146143b1d4..c3eb888d85a900787a183f2141dc2800ad616576 100644
--- a/chrome/browser/media_gallery/media_storage_util.cc
+++ b/chrome/browser/media_gallery/media_storage_util.cc
@@ -101,7 +101,10 @@ std::string MediaStorageUtil::MakeDeviceId(Type type,
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;
+ if (prefix_length != std::string::npos) {
+ prefix = device_id.substr(0, prefix_length + 1);
+ }
Type found_type;
if (prefix == kUsbMassStorageWithDCIMPrefix) {
« chrome/browser/extensions/api/app_runtime/app_runtime_api.cc ('K') | « chrome/browser/extensions/platform_app_launcher.cc ('k') | chrome/browser/media_gallery/media_storage_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698