Docserver: Show callback parameters in all callback references.

BUG=395430
NOTRY=True

Review URL: https://codereview.chromium.org/406933003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285056 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -382,7 +382,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
@@ -429,11 +430,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',)):
@@ -514,12 +517,13 @@ class _JSCModel(object):
 
       return property_dict
 
-  def _GenerateCallbackProperty(self, callback):
+  def _GenerateCallbackProperty(self, callback, callback_dict):
     property_dict = {
       'name': callback.simple_name,
       'description': callback.description,
       'optional': callback.optional,
-      'is_callback': True,
+      'isCallback': True,
+      'asFunction': callback_dict,
       'id': _CreateId(callback, 'property'),
       'simple_type': 'function',
     }

chrome/common/extensions/docs/server2/app.yaml

 application: chrome-apps-doc
-version: 3-34-0
+version: 3-35-0
 runtime: python27
 api_version: 1
 threadsafe: false

chrome/common/extensions/docs/server2/cron.yaml

@@ -2,4 +2,4 @@ cron:
 - description: Repopulates all cached data.
   url: /_cron
   schedule: every 5 minutes
-  target: 3-34-0
+  target: 3-35-0

chrome/common/extensions/docs/templates/private/function_details.html

@@ -20,7 +20,6 @@
       {{+partials.parameter_full
           parameter:p
           parentName:name
-          parentCallback:callback
           hideParamTOC:true /}}
     {{/parameters}}
   </table>

chrome/common/extensions/docs/templates/private/parameter_full.html

@@ -3,7 +3,6 @@
   {{+partials.property
       property:parameter
       parentName:name
-      parentCallback:parentCallback
       hideParamTOC:hideParamTOC/}}
 </tr>
 {{/parameter}}

chrome/common/extensions/docs/templates/private/property.html

@@ -42,8 +42,8 @@
         hideParamTOC:hideParamTOC /}}
   </table>
 {{/parameters}}
-{{?is_callback}}
-  {{?parentCallback +partials.callback callback:parentCallback/}}
-{{/is_callback}}
+{{?isCallback}}
+  {{+partials.callback callback:asFunction/}}
+{{/isCallback}}
 </td>
 {{/property}}