ui/file_manager/file_manager/background/js/background.js - Issue 805533003: Hook up import history to media scanner.

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 805533003: Hook up import history to media scanner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add import history test double. 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:

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 2b72823baaf203ab757a848a714d2e9128aa9572..88b9b20457d06c48f3001141da164b1cd0417341 100644

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

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

@@ -88,7 +88,11 @@ function FileBrowserBackground() {

this.mediaImportHandler =

new importer.MediaImportHandler(

this.fileOperationManager,

- new importer.DefaultMediaScanner());

+ new importer.DefaultMediaScanner(

+ this.historyLoaderPromise.then(

Steve McKay 2014/12/13 00:45:44 Tomasz. I just checked and this triggers the loadi

Steve McKay 2014/12/13 03:46:18 K. This is fixed now.

+ function(loader) {

+ return loader.getHistory();

+ })));

/**

* Promise of string data.