| Index: chrome/renderer/resources/extensions/content_settings_custom_bindings.js
|
| diff --git a/chrome/renderer/resources/extensions/content_settings_custom_bindings.js b/chrome/renderer/resources/extensions/content_settings_custom_bindings.js
|
| index 826ff4553bd0e412da8569be70a03287a0fa5279..d92efc1f9d9ef568342b8137a0be0eb12de7371e 100644
|
| --- a/chrome/renderer/resources/extensions/content_settings_custom_bindings.js
|
| +++ b/chrome/renderer/resources/extensions/content_settings_custom_bindings.js
|
| @@ -6,6 +6,7 @@
|
|
|
| var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
|
| var sendRequest = require('sendRequest').sendRequest;
|
| +var validate = require('schemaUtils').validate;
|
|
|
| chromeHidden.registerCustomType('contentSettings.ContentSetting', function() {
|
| function extendSchema(schema) {
|
| @@ -16,30 +17,31 @@ chromeHidden.registerCustomType('contentSettings.ContentSetting', function() {
|
|
|
| function ContentSetting(contentType, settingSchema) {
|
| this.get = function(details, callback) {
|
| - var getSchema = this.parameters.get;
|
| - chromeHidden.validate([details, callback], getSchema);
|
| + var getSchema = this.functionSchemas.get.definition.parameters;
|
| + validate([details, callback], getSchema);
|
| return sendRequest('contentSettings.get',
|
| [contentType, details, callback],
|
| extendSchema(getSchema));
|
| };
|
| this.set = function(details, callback) {
|
| - var setSchema = this.parameters.set.slice();
|
| + var setSchema = this.functionSchemas.set.definition.parameters.slice();
|
| setSchema[0].properties.setting = settingSchema;
|
| - chromeHidden.validate([details, callback], setSchema);
|
| + validate([details, callback], setSchema);
|
| return sendRequest('contentSettings.set',
|
| [contentType, details, callback],
|
| extendSchema(setSchema));
|
| };
|
| this.clear = function(details, callback) {
|
| - var clearSchema = this.parameters.clear;
|
| - chromeHidden.validate([details, callback], clearSchema);
|
| + var clearSchema = this.functionSchemas.clear.definition.parameters;
|
| + validate([details, callback], clearSchema);
|
| return sendRequest('contentSettings.clear',
|
| [contentType, details, callback],
|
| extendSchema(clearSchema));
|
| };
|
| this.getResourceIdentifiers = function(callback) {
|
| - var schema = this.parameters.getResourceIdentifiers;
|
| - chromeHidden.validate([callback], schema);
|
| + var schema =
|
| + this.functionSchemas.getResourceIdentifiers.definition.parameters;
|
| + validate([callback], schema);
|
| return sendRequest(
|
| 'contentSettings.getResourceIdentifiers',
|
| [contentType, callback],
|
|
|