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

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

Issue 12313142: Revert 184837 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
Index: chrome/renderer/resources/extensions/web_request_custom_bindings.js
===================================================================
--- chrome/renderer/resources/extensions/web_request_custom_bindings.js (revision 184858)
+++ chrome/renderer/resources/extensions/web_request_custom_bindings.js (working copy)
@@ -2,17 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Custom binding for the webRequest API.
+// Custom bindings for the webRequest API.
-var binding = require('binding').Binding.create('webRequest');
-
var webRequestNatives = requireNative('web_request');
var GetUniqueSubEventName = webRequestNatives.GetUniqueSubEventName;
var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
var sendRequest = require('sendRequest').sendRequest;
var validate = require('schemaUtils').validate;
-var webRequestInternal = require('webRequestInternal').binding;
// WebRequestEvent object. This is used for special webRequest events with
// extra parameters. Each invocation of addListener creates a new named
@@ -66,7 +63,7 @@
// Note: this could fail to validate, in which case we would not add the
// subEvent listener.
validate(Array.prototype.slice.call(arguments, 1), this.extraArgSchemas_);
- webRequestInternal.addEventListener(
+ chromeHidden.internalAPIs.webRequestInternal.addEventListener(
cb, opt_filter, opt_extraInfo, this.eventName_, subEventName);
var subEvent = new chrome.Event(subEventName, this.argSchemas_);
@@ -77,10 +74,10 @@
var requestId = arguments[0].requestId;
try {
var result = cb.apply(null, arguments);
- webRequestInternal.eventHandled(
+ chromeHidden.internalAPIs.webRequestInternal.eventHandled(
eventName, subEventName, requestId, result);
} catch (e) {
- webRequestInternal.eventHandled(
+ chromeHidden.internalAPIs.webRequestInternal.eventHandled(
eventName, subEventName, requestId);
throw e;
}
@@ -91,7 +88,7 @@
var details = arguments[0];
var requestId = details.requestId;
var handledCallback = function(response) {
- webRequestInternal.eventHandled(
+ chromeHidden.internalAPIs.webRequestInternal.eventHandled(
eventName, subEventName, requestId, response);
};
cb.apply(null, [details, handledCallback]);
@@ -149,9 +146,9 @@
this.eventForRules_.getRules(ruleIdentifiers, cb);
}
-binding.registerCustomEvent(WebRequestEvent);
+chromeHidden.registerCustomEvent('webRequest', WebRequestEvent);
-binding.registerCustomHook(function(api) {
+chromeHidden.registerCustomHook('webRequest', function(api) {
var apiFunctions = api.apiFunctions;
apiFunctions.setHandleRequest('handlerBehaviorChanged', function() {
@@ -160,5 +157,3 @@
{forIOThread: true});
});
});
-
-exports.binding = binding.generate();

Powered by Google App Engine
This is Rietveld 408576698