summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorserya@google.com <serya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 19:29:16 +0000
committerserya@google.com <serya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 19:29:16 +0000
commitbec078b4d117229f8f5fc371d063688880d56668 (patch)
tree444a059de3b05defd5d40569f9b27b954307ea9e
parent31fb1f6eb033d4ac0dd7c022c214444078615bc5 (diff)
downloadchromium_src-bec078b4d117229f8f5fc371d063688880d56668.zip
chromium_src-bec078b4d117229f8f5fc371d063688880d56668.tar.gz
chromium_src-bec078b4d117229f8f5fc371d063688880d56668.tar.bz2
Merge 145463 - Fixed error handling in root list filling code.
Added diagnostics. BUG=135027 TEST=Manual test. Review URL: https://chromiumcodereview.appspot.com/10704097 TBR=serya@chromium.org Review URL: https://chromiumcodereview.appspot.com/10700166 git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@146171 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/js/directory_model.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/resources/file_manager/js/directory_model.js b/chrome/browser/resources/file_manager/js/directory_model.js
index ecbbe6f..503edf9 100644
--- a/chrome/browser/resources/file_manager/js/directory_model.js
+++ b/chrome/browser/resources/file_manager/js/directory_model.js
@@ -1098,9 +1098,10 @@ DirectoryModel.prototype.resolveRoots_ = function(callback) {
done();
}
- function onSingleError(index, error, defaultValue) {
+ function onSingleError(index, defaultValue, error) {
groups[index] = defaultValue || [];
done();
+ console.error('Error resolving root dir ', index, 'error: ', error);
}
var root = this.root_;