Index: chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js |
diff --git a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js b/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js |
index df81bbaef14d54cfa7dc8844f46a6dd372d3ff16..e0b90c96fa1fb384e7eac1d9daa86ceca89b86f9 100644 |
--- a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js |
+++ b/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js |
@@ -27,12 +27,17 @@ chromeHidden.registerCustomHook('fileBrowserPrivate', function(bindingsAPI) { |
apiFunctions.setCustomCallback('searchGData', |
function(name, request, response) { |
- if (response && !response.error && response) { |
- for (var i = 0; i < response.length; i++) |
- response[i] = GetExternalFileEntry(response[i]); |
+ if (response && !response.error && response.entries) { |
+ for (var i = 0; i < response.entries.length; i++) |
+ response.entries[i] = GetExternalFileEntry(response.entries[i]); |
} |
+ |
+ // So |request.callback| doesn't break if response is not defined. |
+ if (!response) |
+ response = {}; |
+ |
if (request.callback) |
- request.callback(response); |
+ request.callback(response.entries, response.nextFeed); |
request.callback = null; |
}); |
}); |