| Index: chrome/renderer/resources/extensions/downloads_custom_bindings.js
|
| diff --git a/chrome/renderer/resources/extensions/downloads_custom_bindings.js b/chrome/renderer/resources/extensions/downloads_custom_bindings.js
|
| index be7d1c42cbd23248b6ee856e1e09d1e92b18c655..fff3b1664ccf34bf88b72c9b36a6ae41bf2687a6 100644
|
| --- a/chrome/renderer/resources/extensions/downloads_custom_bindings.js
|
| +++ b/chrome/renderer/resources/extensions/downloads_custom_bindings.js
|
| @@ -25,10 +25,10 @@ eventBindings.registerArgumentMassager(
|
| if ((typeof(result) == 'object') &&
|
| result.filename &&
|
| (typeof(result.filename) == 'string') &&
|
| - ((result.conflict_action == undefined) ||
|
| - (typeof(result.conflict_action) == 'string'))) {
|
| + ((result.conflictAction == undefined) ||
|
| + (typeof(result.conflictAction) == 'string'))) {
|
| downloadsInternal.determineFilename(
|
| - downloadId, result.filename, result.conflict_action || "");
|
| + downloadId, result.filename, result.conflictAction || "");
|
| } else {
|
| downloadsInternal.determineFilename(downloadId, "", "");
|
| }
|
|
|