Docserver: Show callback parameters in all callback references.

chrome/common/extensions/docs/server2/api_data_source.py

Index: chrome/common/extensions/docs/server2/api_data_source.py
diff --git a/chrome/common/extensions/docs/server2/api_data_source.py b/chrome/common/extensions/docs/server2/api_data_source.py
index 89296fa073cf73ef3d96946ec158eb89141344bf..fa040fa9024a8e477eb28895d282db0612a8d6d9 100644
--- a/chrome/common/extensions/docs/server2/api_data_source.py
+++ b/chrome/common/extensions/docs/server2/api_data_source.py
@@ -379,7 +379,8 @@ class _JSCModel(object):
       if function.callback is not None:
         # Show the callback as an extra parameter.
         function_dict['parameters'].append(
-            self._GenerateCallbackProperty(function.callback))
+            self._GenerateCallbackProperty(function.callback,
+                                           function_dict['callback']))
       if len(function_dict['parameters']) > 0:
         function_dict['parameters'][-1]['last'] = True
       return function_dict
@@ -426,11 +427,13 @@ class _JSCModel(object):
         callback_object.params = event.params
         if event.callback:
           callback_object.callback = event.callback
-        callback_parameters = self._GenerateCallbackProperty(callback_object)
+        callback = self._GenerateFunction(callback_object)
+        callback_parameters = self._GenerateCallbackProperty(callback_object,
+                                                             callback)
         callback_parameters['last'] = True
         event_dict['byName']['addListener'] = {
           'name': 'addListener',
-          'callback': self._GenerateFunction(callback_object),
+          'callback': callback,
           'parameters': [callback_parameters]
         }
     with self._current_node.Descend(event.simple_name, ignore=('properties',)):
@@ -511,12 +514,12 @@ class _JSCModel(object):
 
       return property_dict
 
-  def _GenerateCallbackProperty(self, callback):
+  def _GenerateCallbackProperty(self, callback, callback_dict):

[not at google - send to devlin, 2014/07/23 03:25:03]

kinda weird to be passing in |callback_dict| when you can determine it from
|callback| but it does save doing the same work twice, so worth it in that
respect.

I think this is all because once upon a time a callback was just modelled as a
function. Like, there was no "GenerateCallbackProperty" there was just
"GenerateFunction". However that caused some sort of issue so it was split up?

but that's the funny part - GenerateFunction *does* have a 'callback' property
already, and it actually means a callback to that function. That's not what
it'll mean here, and I'm not sure what that will do.

would it work to have 2 properties, "isCallback" and "asFunction"? is that
enough to get by?

     property_dict = {
       'name': callback.simple_name,
       'description': callback.description,
       'optional': callback.optional,
-      'is_callback': True,
+      'callback': callback_dict,
       'id': _CreateId(callback, 'property'),
       'simple_type': 'function',
     }