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 a805578ef41ce49b3b7148b7a3e4e3b05d2a4591..403dc14d3180c37646556da64e66b7d3f207f727 100644 |
--- a/chrome/renderer/resources/extensions/send_request.js |
+++ b/chrome/renderer/resources/extensions/send_request.js |
@@ -13,6 +13,10 @@ var validate = require('schemaUtils').validate; |
// All outstanding requests from sendRequest(). |
var requests = {}; |
+// Used to prevent double Activity Logging for API calls that use both custom |
+// bindings and ExtensionFunctions (via sendRequest). |
+var requestStatus = false; |
Matt Perry
2013/03/15 23:33:21
nit: I wouldn't guess what this for based on the n
felt
2013/03/15 23:40:17
Done.
|
+ |
// Callback handling. |
chromeHidden.handleResponse = function(requestId, name, |
success, responseList, error) { |
@@ -103,6 +107,7 @@ function prepareRequest(args, argSchemas) { |
// thread. |
// - preserveNullInObjects: true if it is safe for null to be in objects. |
function sendRequest(functionName, args, argSchemas, optArgs) { |
+ requestStatus = true; |
if (!optArgs) |
optArgs = {}; |
var request = prepareRequest(args, argSchemas); |
@@ -134,4 +139,15 @@ function sendRequest(functionName, args, argSchemas, optArgs) { |
optArgs.preserveNullInObjects); |
} |
+function getRequestStatus() { |
+ return requestStatus; |
+} |
+ |
+function setRequestStatus(status) { |
+ requestStatus = status; |
+} |
+ |
exports.sendRequest = sendRequest; |
+exports.requestStatus = requestStatus; |
+exports.getRequestStatus = getRequestStatus; |
+exports.setRequestStatus = setRequestStatus; |
Matt Perry
2013/03/15 23:33:21
nit: better to expose a clearRequestStatus that al
felt
2013/03/15 23:40:17
Done.
|