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

Unified Diff: ui/file_manager/file_manager/foreground/js/import_controller.js

Issue 2594523002: Postpone the content duplication check until starting import. (Closed)
Patch Set: indent fix Created 4 years 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 | « ui/file_manager/file_manager/background/js/media_import_handler_unittest.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/file_manager/file_manager/foreground/js/import_controller.js
diff --git a/ui/file_manager/file_manager/foreground/js/import_controller.js b/ui/file_manager/file_manager/foreground/js/import_controller.js
index 8659572986716a7f1d0d382d9121425fb6f19738..a2963c81d8c1e7542db2746aeba33ded5ba77cfc 100644
--- a/ui/file_manager/file_manager/foreground/js/import_controller.js
+++ b/ui/file_manager/file_manager/foreground/js/import_controller.js
@@ -175,7 +175,7 @@ importer.ImportController.prototype.onDirectoryChanged_ = function(event) {
this.scanManager_.reset();
if (this.isCurrentDirectoryScannable_()) {
this.checkState_(
- this.scanManager_.getDirectoryScan(importer.ScanMode.CONTENT));
+ this.scanManager_.getDirectoryScan(importer.ScanMode.HISTORY));
} else {
this.checkState_();
}
@@ -202,7 +202,7 @@ importer.ImportController.prototype.onSelectionChanged_ = function() {
if (this.environment_.getSelection().length === 0 &&
this.isCurrentDirectoryScannable_()) {
this.checkState_(
- this.scanManager_.getDirectoryScan(importer.ScanMode.CONTENT));
+ this.scanManager_.getDirectoryScan(importer.ScanMode.HISTORY));
} else {
this.checkState_();
}
@@ -226,7 +226,7 @@ importer.ImportController.prototype.onScanInvalidated_ = function() {
if (this.environment_.getSelection().length === 0 &&
this.isCurrentDirectoryScannable_()) {
this.checkState_(
- this.scanManager_.getDirectoryScan(importer.ScanMode.CONTENT));
+ this.scanManager_.getDirectoryScan(importer.ScanMode.HISTORY));
} else {
this.checkState_();
}
@@ -367,7 +367,7 @@ importer.ImportController.prototype.checkState_ = function(opt_scan) {
// NOTE, that tryScan_ lazily initializes scans...so if
// no scan is returned, no scan is possible for the
// current context.
- var scan = this.tryScan_(importer.ScanMode.CONTENT);
+ var scan = this.tryScan_(importer.ScanMode.HISTORY);
// If no scan is created, then no scan is possible in
// the current context...so hide the UI.
if (!scan) {
« no previous file with comments | « ui/file_manager/file_manager/background/js/media_import_handler_unittest.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698