ui/file_manager/file_manager/background/js/background.js - Issue 792233009: Reflect scanning status in command UI. Only allow import once scanning is complete.

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: ui/file_manager/file_manager/background/js/background.js

Issue 792233009: Reflect scanning status in command UI. Only allow import once scanning is complete. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix FM.jstests.cc && Finalize scan results in MediaImportHandlerTest...unbreaking the test. Created 6 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 | « chrome/browser/chromeos/file_manager/file_manager_jstest.cc ('k') | ui/file_manager/file_manager/background/js/import_history.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/file_manager/file_manager/background/js/background.js

diff --git a/ui/file_manager/file_manager/background/js/background.js b/ui/file_manager/file_manager/background/js/background.js

index 43825d69e987776aa4a927eba478f3ba3cfed690..08723a36c0a6c98e7b77d0b0067fad8d76e45592 100644

--- a/ui/file_manager/file_manager/background/js/background.js

+++ b/ui/file_manager/file_manager/background/js/background.js

@@ -81,14 +81,19 @@ function FileBrowserBackground() {

function() { this.tryClose(); }.bind(this));

/**

+ * Provides support for scaning media devices as part of Cloud Import.

+ * @type {!importer.MediaScanner}

+ */

+ this.mediaScanner = new importer.DefaultMediaScanner(this.historyLoader);

+ /**

* Handles importing of user media (e.g. photos, videos) from removable

* devices.

* @type {!importer.MediaImportHandler}

this.mediaImportHandler =

new importer.MediaImportHandler(

- this.fileOperationManager,

- new importer.DefaultMediaScanner(this.historyLoader));

+ this.fileOperationManager);

/**

* Promise of string data.