summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroleg@chromium.org <oleg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 15:26:40 +0000
committeroleg@chromium.org <oleg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 15:26:40 +0000
commitb9692bfff4e5cbb8e8ac9d62b95d68a84623ed19 (patch)
treebfea4b8b7dab8e3ccfda68186ecf25e34324742a
parent06c6d4147ee9483e5409248e3d7575b730a8d814 (diff)
downloadchromium_src-b9692bfff4e5cbb8e8ac9d62b95d68a84623ed19.zip
chromium_src-b9692bfff4e5cbb8e8ac9d62b95d68a84623ed19.tar.gz
chromium_src-b9692bfff4e5cbb8e8ac9d62b95d68a84623ed19.tar.bz2
Fix chrome.fileBrowserPrivate.cancelFileTransfers call.
BUG=150052 Review URL: https://chromiumcodereview.appspot.com/10956012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157770 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/js/file_copy_manager.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/resources/file_manager/js/file_copy_manager.js b/chrome/browser/resources/file_manager/js/file_copy_manager.js
index febb240..aea4cb6 100644
--- a/chrome/browser/resources/file_manager/js/file_copy_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_copy_manager.js
@@ -852,8 +852,14 @@ FileCopyManager.prototype.serviceNextTaskEntry_ = function(
self.cancelCallback_ = null;
chrome.fileBrowserPrivate.onFileTransfersUpdated.removeListener(
onFileTransfersUpdated);
- chrome.fileBrowserPrivate.cancelFileTransfers([sourceFileUrl],
- function() {});
+ if (task.sourceOnGData) {
+ chrome.fileBrowserPrivate.cancelFileTransfers([sourceFileUrl],
+ function() {});
+ } else {
+ chrome.fileBrowserPrivate.cancelFileTransfers([targetFileUrl],
+ function() {});
+ }
+
self.doCancel_();
};