Move declarative API into events API

chrome/renderer/resources/extensions/schema_generated_bindings.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This script contains privileged chrome extension related javascript APIs.
 // It is loaded by pages whose URL has the chrome-extension protocol.
 
   require('json_schema');
   require('event_bindings');
   var GetExtensionAPIDefinition =

[Aaron Boodman, 2012/05/10 17:14:49]

I would like to propose the following rule:

When importing with require, always reference the imported function with their
module name, so like:

var apiDefinitions = requireNative('apiDefinitions');
var sendRequest = require('sendRequest');
var utils = require('utils');

var definition = apiDefinitions.GetExtensionAPIDefinition(..);

util.forEach(...);

It seems more clear to me to always see these functions prefixed by their module
name. You can see from looking at them that they are an imported function.

[battre, 2012/05/10 18:05:22]

I like that.

I have done this for "utils" and added a TODO for the rest to handle that in a
separate CL.

       requireNative('apiDefinitions').GetExtensionAPIDefinition;
   var sendRequest = require('sendRequest').sendRequest;
+  var forEach = require('utils').forEach;
+  var lookup = require('utils').lookup;
 
   var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 
   // The object to generate the bindings for "internal" APIs in, so that
   // extensions can't directly call them (without access to chromeHidden),
   // but are still needed for internal mechanisms of extensions (e.g. events).
   //
   // This is distinct to the "*Private" APIs which are controlled via
   // having strict permissions and aren't generated *anywhere* unless needed.
   var internalAPIs = {};
   chromeHidden.internalAPIs = internalAPIs;
 
-  function forEach(dict, f) {
-    for (key in dict) {
-      if (dict.hasOwnProperty(key))
-        f(key, dict[key]);
-    }
-  }
-
   // Validate arguments.
   var schemaValidator = new chromeHidden.JSONSchemaValidator();
   chromeHidden.validate = function(args, parameterSchemas) {
     if (args.length > parameterSchemas.length)
       throw new Error("Too many arguments.");
 
     for (var i = 0; i < parameterSchemas.length; i++) {
       if (i in args && args[i] !== null && args[i] !== undefined) {
         schemaValidator.resetErrors();
         schemaValidator.validate(args[i], parameterSchemas[i]);
@@ skipping 310 matching lines @@
                                            manifestVersion) {
     var apiDefinitions = GetExtensionAPIDefinition();
 
     // Read api definitions and setup api functions in the chrome namespace.
     // TODO(rafaelw): Consider defining a json schema for an api definition
     //   and validating either here, in a unit_test or both.
     // TODO(rafaelw): Handle synchronous functions.
     // TODO(rafaelw): Consider providing some convenient override points
     //   for api functions that wish to insert themselves into the call.
     var platform = getPlatform();
+    var eventsSchema = lookup(apiDefinitions, 'namespace', 'events');
 
     apiDefinitions.forEach(function(apiDef) {
       // TODO(kalman): Remove this, or refactor schema_generated_bindings.js so
       // that it isn't necessary. For now, chrome.app is entirely handwritten.
       if (apiDef.namespace === 'app')
         return;
 
       if (!isSchemaNodeSupported(apiDef, platform, manifestVersion))
         return;
 
@@ skipping 116 matching lines @@
           if (!isSchemaAccessAllowed(eventDef)) {
             addUnprivilegedAccessGetter(mod, eventDef.name);
             return;
           }
 
           var eventName = apiDef.namespace + "." + eventDef.name;
           var customEvent = customEvents[apiDef.namespace];
           if (customEvent) {
             mod[eventDef.name] = new customEvent(
                 eventName, eventDef.parameters, eventDef.extraParameters,
-                eventDef.options);
+                eventDef.options, eventsSchema);
           } else if (eventDef.anonymous) {
             mod[eventDef.name] = new chrome.Event();
           } else {
             mod[eventDef.name] = new chrome.Event(
-                eventName, eventDef.parameters, eventDef.options);
+                eventName, eventDef.parameters, eventDef.options, eventsSchema);
           }
         });
       }
 
       function addProperties(m, parentDef) {
         var properties = parentDef.properties;
         if (!properties)
           return;
 
         forEach(properties, function(propertyName, propertyDef) {
@@ skipping 69 matching lines @@
     // beginInstallWithManifest2.
     // See http://crbug.com/100242
     if (chrome.webstorePrivate) {
       chrome.webstorePrivate.beginInstallWithManifest2 =
           chrome.webstorePrivate.beginInstallWithManifest3;
     }
 
     if (chrome.test)
       chrome.test.getApiDefinitions = GetExtensionAPIDefinition;
   });