chrome/browser/resources/file_manager/js/directory_model.js - Issue 25278002: Extract ContentScanner from DirectoryContent.

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/js/directory_model.js

Issue 25278002: Extract ContentScanner from DirectoryContent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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:

Index: chrome/browser/resources/file_manager/js/directory_model.js

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

index 23d9419647b39917cd00c26189ba205f9fb4bcb7..25f09b6c6e5b76ce610a3f6285c551079d7edd38 100644

--- a/chrome/browser/resources/file_manager/js/directory_model.js

+++ b/chrome/browser/resources/file_manager/js/directory_model.js

@@ -490,7 +490,8 @@ DirectoryModel.prototype.clearAndScan_ = function(newDirContents,

this.pendingScan_ = false;

if (this.runningScan_) {

- this.runningScan_.cancelScan();

+ if (this.runningScan_.isScanning())

+ this.runningScan_.cancelScan();

this.runningScan_ = null;

}

@@ -1199,15 +1200,15 @@ DirectoryModel.prototype.specialSearch = function(path, opt_query) {

if (specialSearchType == RootType.DRIVE_OFFLINE) {

dirEntry = DirectoryModel.fakeDriveOfflineEntry_;

searchOption =

- DirectoryContentsDriveSearchMetadata.SearchType.SEARCH_OFFLINE;

+ DriveMetadataSearchContentScanner.SearchType.SEARCH_OFFLINE;

} else if (specialSearchType == RootType.DRIVE_SHARED_WITH_ME) {

dirEntry = DirectoryModel.fakeDriveSharedWithMeEntry_;

searchOption =

- DirectoryContentsDriveSearchMetadata.SearchType.SEARCH_SHARED_WITH_ME;

+ DriveMetadataSearchContentScanner.SearchType.SEARCH_SHARED_WITH_ME;

} else if (specialSearchType == RootType.DRIVE_RECENT) {

dirEntry = DirectoryModel.fakeDriveRecentEntry_;

searchOption =

- DirectoryContentsDriveSearchMetadata.SearchType.SEARCH_RECENT_FILES;

+ DriveMetadataSearchContentScanner.SearchType.SEARCH_RECENT_FILES;

} else {

// Unknown path.