chrome/browser/resources/file_manager/foreground/js/file_transfer_controller.js - Issue 179553008: Simplify volume manager in Files app.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/file_manager/foreground/js/file_transfer_controller.js

Issue 179553008: Simplify volume manager in Files app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed unmounting. Created 6 years, 10 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

« no previous file with comments | « chrome/browser/resources/file_manager/foreground/js/file_tasks.js ('k') | chrome/browser/resources/file_manager/foreground/js/folder_shortcuts_data_model.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/foreground/js/file_transfer_controller.js

diff --git a/chrome/browser/resources/file_manager/foreground/js/file_transfer_controller.js b/chrome/browser/resources/file_manager/foreground/js/file_transfer_controller.js

index f5ecbe4bbd6358c3b5b6631a813bd4997e3053c8..7a19b1722bf2fe93d2b4071886981d6797a2995f 100644

--- a/chrome/browser/resources/file_manager/foreground/js/file_transfer_controller.js

+++ b/chrome/browser/resources/file_manager/foreground/js/file_transfer_controller.js

@@ -159,7 +159,8 @@ FileTransferController.prototype = {

this.currentDirectoryContentEntry);

// Tag to check it's filemanager data.

dataTransfer.setData('fs/tag', 'filemanager-data');

- dataTransfer.setData('fs/sourceRootURL', volumeInfo.root.toURL());

+ dataTransfer.setData('fs/sourceRootURL',

+ volumeInfo.fileSystem.root.toURL());

var sourceURLs = util.entriesToURLs(this.selectedEntries_);

dataTransfer.setData('fs/sources', sourceURLs.join('\n'));

dataTransfer.effectAllowed = effectAllowed;

@@ -743,7 +744,7 @@ FileTransferController.prototype = {

// Copying between different sources requires all files to be available.

if (this.getSourceRootURL_(dataTransfer) !==

- destinationLocationInfo.volumeInfo.root.toURL() &&

+ destinationLocationInfo.volumeInfo.fileSystem.root.toURL() &&

this.isMissingFileContents_(dataTransfer))

return false;

@@ -930,7 +931,7 @@ FileTransferController.prototype = {

// volumeId gets unique.

if (event.dataTransfer.effectAllowed === 'copyMove' &&

this.getSourceRootURL_(event.dataTransfer) ===

- destinationLocationInfo.volumeInfo.root.toURL() &&

+ destinationLocationInfo.volumeInfo.fileSystem.root.toURL() &&

!event.ctrlKey) {

return 'move';

}