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 =
@@ skipping 11 matching lines @@
   var internalAPIs = {};
   chromeHidden.internalAPIs = internalAPIs;
 
   function forEach(dict, f) {
     for (key in dict) {
       if (dict.hasOwnProperty(key))
         f(key, dict[key]);
     }
   }
 
+  // Assuming |array_of_dictionaries| is structured like this:
+  // [{id: 1, ... }, {id: 2, ...}, ...], you can use
+  // lookup(array_of_dictionaries, 'id', 2) to get the dictionary with id == 2.
+  chromeHidden.lookup = function(array_of_dictionaries, field, value) {
+    var filter = function (dict) {return dict[field] == value;};
+    var matches = array_of_dictionaries.filter(filter);
+    if (matches.length == 0) {
+      return undefined;
+    } else if (matches.length == 1) {
+      return matches[0]
+    } else {
+      throw new Error("Failed lookup of field '" + field + "' with value '" +
+                      value + "'");

[battre, 2012/05/09 16:28:08]

TODO(battre): update error message.

+    }

[not at google - send to devlin, 2012/05/10 09:01:25]

hmmmm I want to avoid putting random utilities on chromeHidden if possible.  It
implies an execution order on these custom bindings files rather than
modularity.

So: how about creating a new file like "util.js", put this on that, then
require() it (similar to how we require() sendRequest)

We could also put forEach in there for good measure.

[battre, 2012/05/10 16:40:29]

I like that idea very much. Done.

+  }
+
   // 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 = chromeHidden.lookup(apiDefinitions,
+                                           'namespace', 'events');

[not at google - send to devlin, 2012/05/10 09:01:25]

nit: arguments 1 line or vertical thing

 
     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;
   });