Extension Docs Server: Include a list of samples used in the api reference page.

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

Index: chrome/common/extensions/docs/server2/template_data_source.py
diff --git a/chrome/common/extensions/docs/server2/template_data_source.py b/chrome/common/extensions/docs/server2/template_data_source.py
index 80a6594a81dbf722b08a381099120e65a4dec799..633e92593c9b83c1f4eb68452cf0ed4674f4be6e 100644
--- a/chrome/common/extensions/docs/server2/template_data_source.py
+++ b/chrome/common/extensions/docs/server2/template_data_source.py
@@ -39,7 +39,7 @@ class TemplateDataSource(object):
     """
     def __init__(self,
                  branch,
-                 api_data_source,
+                 api_data_source_factory,
                  api_list_data_source,
                  intro_data_source,
                  samples_data_source_factory,
@@ -49,7 +49,7 @@ class TemplateDataSource(object):
       self._branch_info = _MakeBranchDict(branch)
       self._static_resources = ((('/' + branch) if branch != 'local' else '') +
                                 '/static')
-      self._api_data_source = api_data_source
+      self._api_data_source_factory = api_data_source_factory
       self._api_list_data_source = api_list_data_source
       self._intro_data_source = intro_data_source
       self._samples_data_source_factory = samples_data_source_factory
@@ -62,7 +62,7 @@ class TemplateDataSource(object):
       """
       return TemplateDataSource(self._branch_info,
                                 self._static_resources,
-                                self._api_data_source,
+                                self._api_data_source_factory,
                                 self._api_list_data_source,
                                 self._intro_data_source,
                                 self._samples_data_source_factory,
@@ -74,7 +74,7 @@ class TemplateDataSource(object):
   def __init__(self,
                branch_info,
                static_resources,
-               api_data_source,
+               api_data_source_factory,
                api_list_data_source,
                intro_data_source,
                samples_data_source_factory,
@@ -84,10 +84,11 @@ class TemplateDataSource(object):
                request):
     self._branch_info = branch_info
     self._static_resources = static_resources
-    self._api_data_source = api_data_source
     self._api_list_data_source = api_list_data_source
     self._intro_data_source = intro_data_source
     self._samples_data_source = samples_data_source_factory.Create(request)
+    self._api_data_source = api_data_source_factory.Create(
+        self._samples_data_source)

[not at google - send to devlin, 2012/08/01 20:56:32]

Something funky happened here, Create takes a request object not a samples data
source.

If you moved the Create calls out of __init__ and into Create this would become
clearer, I think. I.e. only pass concrete classes into here, no factories.

[chebert, 2012/08/02 18:40:23]

Done.

     self._cache = cache
     self._public_template_path = public_template_path
     self._private_template_path = private_template_path