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

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

Issue 10342010: Add gdata content search to file_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix indent Created 8 years, 7 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
Index: chrome/browser/resources/file_manager/js/file_transfer_controller.js
diff --git a/chrome/browser/resources/file_manager/js/file_transfer_controller.js b/chrome/browser/resources/file_manager/js/file_transfer_controller.js
index 4e58aaeebc720a8e69affdad8fd5590a5ed3c00a..9a0f0d93a29135919c2f5637a5c6f156718f9004 100644
--- a/chrome/browser/resources/file_manager/js/file_transfer_controller.js
+++ b/chrome/browser/resources/file_manager/js/file_transfer_controller.js
@@ -428,6 +428,8 @@ FileTransferController.prototype = {
if (this.directoryModel_.isPathReadOnly(destinationPath)) {
return false;
}
+ if (this.directoryModel_.isSearching())
+ return false;
if (!dataTransfer.types || dataTransfer.types.indexOf('fs/tag') == -1)
return false; // Unsupported type of content.
@@ -509,7 +511,7 @@ FileTransferController.prototype = {
},
get currentDirectory() {
- return this.directoryModel_.getCurrentDirEntry();
+ return this.directoryModel_.getSearchOrCurrentDirEntry();
},
get readonly() {
« no previous file with comments | « chrome/browser/resources/file_manager/js/file_manager.js ('k') | chrome/browser/resources/file_manager/js/util.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698