summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 10:08:32 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 10:08:32 +0000
commit6436e3094b8aa9d290dc37cc1f236b9d5c722b66 (patch)
tree19a6cbb26ffe001d7230932f866b724dfdfd3b85
parent923c116f86cfc2d1f500e0a1afbe69999297e354 (diff)
downloadchromium_src-6436e3094b8aa9d290dc37cc1f236b9d5c722b66.zip
chromium_src-6436e3094b8aa9d290dc37cc1f236b9d5c722b66.tar.gz
chromium_src-6436e3094b8aa9d290dc37cc1f236b9d5c722b66.tar.bz2
Fix mime type calculation in Drive uploading.
Whether "extension" includes "." or not, that is the problem. BUG=166104. Review URL: https://codereview.chromium.org/11577018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173140 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/drive/file_system/copy_operation.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
index 3e20e53..c962ebc 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
@@ -178,8 +178,8 @@ void CopyOperation::TransferRegularFile(
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
- base::Bind(&net::GetMimeTypeFromExtension,
- remote_dest_file_path.Extension(),
+ base::Bind(&net::GetMimeTypeFromFile,
+ remote_dest_file_path,
base::Unretained(content_type)),
base::Bind(&CopyOperation::StartFileUpload,
weak_ptr_factory_.GetWeakPtr(),