Chromium Code Reviews| Index: chrome/browser/chromeos/fileapi/external_file_url_util.cc |
| diff --git a/chrome/browser/chromeos/fileapi/external_file_url_util.cc b/chrome/browser/chromeos/fileapi/external_file_url_util.cc |
| index 90b4a0c0db91379f4c302334fb1803c05320007d..61aabc8e41bc7e7c28f2417581276a4c19364c59 100644 |
| --- a/chrome/browser/chromeos/fileapi/external_file_url_util.cc |
| +++ b/chrome/browser/chromeos/fileapi/external_file_url_util.cc |
| @@ -24,23 +24,23 @@ using content::BrowserThread; |
| namespace chromeos { |
| +bool IsExternalFileURLType(storage::FileSystemType type) { |
| + return type == storage::kFileSystemTypeDrive || |
| + type == storage::kFileSystemTypeDeviceMediaAsFileStorage || |
| + type == storage::kFileSystemTypeProvided; |
| +} |
| + |
| GURL FileSystemURLToExternalFileURL( |
| const storage::FileSystemURL& file_system_url) { |
| - if (file_system_url.mount_type() != storage::kFileSystemTypeExternal) |
| + if (file_system_url.mount_type() != storage::kFileSystemTypeExternal || |
| + !IsExternalFileURLType(file_system_url.type())) { |
| return GURL(); |
| - |
| - switch (file_system_url.type()) { |
| - case storage::kFileSystemTypeDrive: |
| - case storage::kFileSystemTypeDeviceMediaAsFileStorage: |
| - case storage::kFileSystemTypeProvided: |
| - return GURL(base::StringPrintf( |
| - "%s:%s", |
| - chrome::kExternalFileScheme, |
| - file_system_url.virtual_path().AsUTF8Unsafe().c_str())); |
| - |
| - default: |
| - return GURL(); |
| } |
| + |
| + return GURL(base::StringPrintf( |
| + "%s:%s", |
| + chrome::kExternalFileScheme, |
| + file_system_url.virtual_path().AsUTF8Unsafe().c_str())); |
|
mtomasz
2014/09/29 12:47:40
Sorry for not catching earlier, but does this prop
hirono
2014/09/29 13:24:02
Yes we needed to this. It seems an issue from the
|
| } |
| base::FilePath ExternalFileURLToVirtualPath(const GURL& url) { |