chrome/browser/resources/file_manager/background/js/progress_center.js - Issue 98363003: Files.app: Add a unit test of ProgressCenterHandler class.

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/background/js/progress_center.js

Issue 98363003: Files.app: Add a unit test of ProgressCenterHandler class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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') | chrome/test/data/file_manager/unit_tests/mocks/mock_file_operation_manager.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/background/js/progress_center.js

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

index 9726c67d6ea40e650f6ec5f8e189e91a7f186eec..b28329ef92299abea3e51f71fe4e60352a160a7d 100644

--- a/chrome/browser/resources/file_manager/background/js/progress_center.js

+++ b/chrome/browser/resources/file_manager/background/js/progress_center.js

@@ -535,10 +535,10 @@ ProgressCenterHandler.getMessage_ = function(event) {

default:

switch (event.status.operationType) {

- case 'COPY': return strf('COPY_UNEXPECTED_ERROR', event.error);

- case 'MOVE': return strf('MOVE_UNEXPECTED_ERROR', event.error);

- case 'ZIP': return strf('ZIP_UNEXPECTED_ERROR', event.error);

- default: return strf('TRANSFER_UNEXPECTED_ERROR', event.error);

+ case 'COPY': return strf('COPY_UNEXPECTED_ERROR', event.error.code);

+ case 'MOVE': return strf('MOVE_UNEXPECTED_ERROR', event.error.code);

+ case 'ZIP': return strf('ZIP_UNEXPECTED_ERROR', event.error.code);

+ default: return strf('TRANSFER_UNEXPECTED_ERROR', event.error.code);

}

} else if (event.status.numRemainingItems === 1) {

@@ -638,7 +638,7 @@ ProgressCenterHandler.prototype.onCopyProgress_ = function(event) {

if (!item) {

// ERROR events can be dispatched before BEGIN events.

item = new ProgressCenterItem();

- item.type = ProgressCenterHandler.getType(event.status.operationType);

+ item.type = ProgressCenterHandler.getType_(event.status.operationType);

item.id = event.taskId;

item.progressMax = 1;

}

@@ -647,7 +647,7 @@ ProgressCenterHandler.prototype.onCopyProgress_ = function(event) {

item.state = ProgressItemState.COMPLETED;

item.progressValue = item.progressMax;

} else if (event.reason === 'CANCELED') {

- item.message = ProgressCenterHandler.getMessage_(event);

+ item.message = '';

item.state = ProgressItemState.CANCELED;

} else {

item.message = ProgressCenterHandler.getMessage_(event);