Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(788)

Unified Diff: chrome/renderer/resources/extensions/send_request.js

Issue 10703111: Cleanup: make ExtensionRequestSender manage its IPC responses directly, rather (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert sceopd_observer change Created 8 years, 5 months 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/renderer/extensions/set_icon_natives.cc ('k') | chrome/test/base/chrome_render_view_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/resources/extensions/send_request.js
diff --git a/chrome/renderer/resources/extensions/send_request.js b/chrome/renderer/resources/extensions/send_request.js
index 2ea6545dfaabcae2acbaff9ae38f610ee61fc7e1..4ef4eec6e937d886555d35b74bd8801e20194770 100644
--- a/chrome/renderer/resources/extensions/send_request.js
+++ b/chrome/renderer/resources/extensions/send_request.js
@@ -114,13 +114,15 @@ function sendRequest(functionName, args, argSchemas, opt_args) {
chromeHidden.JSON.stringify(request.args) : request.args;
var nativeFunction = opt_args.nativeFunction || natives.StartRequest;
- var requestId = natives.GetNextRequestId();
- request.id = requestId;
- requests[requestId] = request;
- var hasCallback =
- (request.callback || opt_args.customCallback) ? true : false;
- return nativeFunction(functionName, requestArgs, requestId, hasCallback,
- opt_args.forIOThread);
+ var hasCallback = !!(request.callback || opt_args.customCallback);
+ var requestId = nativeFunction(functionName,
+ requestArgs,
+ hasCallback,
+ opt_args.forIOThread);
+ if (typeof(requestId) == 'number' && requestId >= 0) {
+ request.id = requestId;
+ requests[requestId] = request;
+ }
}
exports.sendRequest = sendRequest;
« no previous file with comments | « chrome/renderer/extensions/set_icon_natives.cc ('k') | chrome/test/base/chrome_render_view_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698