Docserver: SidenavDataSource refactor, transition to DataSourceRegistry

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 1bf9ad6a472b2fae02776d2f909c6c2bbce4dafd..a6899a7a0861155a11a189d6c15d0df8ba6c09ef 100644
--- a/chrome/common/extensions/docs/server2/template_data_source.py
+++ b/chrome/common/extensions/docs/server2/template_data_source.py
@@ -32,19 +32,16 @@ class TemplateDataSource(object):
                  api_list_data_source_factory,
                  intro_data_source_factory,
                  samples_data_source_factory,
-                 sidenav_data_source_factory,
                  compiled_fs_factory,
                  ref_resolver_factory,
                  permissions_data_source,
                  public_template_path,
                  private_template_path,
-                 base_path,
-                 data_sources):
+                 base_path):
       self._api_data_source_factory = api_data_source_factory
       self._api_list_data_source_factory = api_list_data_source_factory
       self._intro_data_source_factory = intro_data_source_factory
       self._samples_data_source_factory = samples_data_source_factory
-      self._sidenav_data_source_factory = sidenav_data_source_factory
       self._cache = compiled_fs_factory.Create(self._CreateTemplate,
                                                TemplateDataSource)
       self._ref_resolver = ref_resolver_factory.Create()
@@ -52,12 +49,11 @@ class TemplateDataSource(object):
       self._public_template_path = public_template_path
       self._private_template_path = private_template_path
       self._base_path = base_path
-      self._data_sources = data_sources
 
     def _CreateTemplate(self, template_name, text):
       return Handlebar(self._ref_resolver.ResolveAllLinks(text))
 
-    def Create(self, request, path):
+    def Create(self, request, path, data_sources):

[Jeffrey Yasskin, 2013/08/28 19:12:37]

Please document the types of these arguments, and the expected keys and value
types for dictionaries.

[jshumway, 2013/08/29 00:13:09]

Done.

       """Returns a new TemplateDataSource bound to |request|.
       """
       return TemplateDataSource(
@@ -65,20 +61,18 @@ class TemplateDataSource(object):
           self._api_list_data_source_factory.Create(),
           self._intro_data_source_factory.Create(),
           self._samples_data_source_factory.Create(request),
-          self._sidenav_data_source_factory.Create(path),
           self._cache,
           self._permissions_data_source,
           self._public_template_path,
           self._private_template_path,
           self._base_path,
-          self._data_sources)
+          data_sources)
 
   def __init__(self,
                api_data_source,
                api_list_data_source,
                intro_data_source,
                samples_data_source,
-               sidenav_data_source,
                cache,
                permissions_data_source,
                public_template_path,
@@ -89,7 +83,6 @@ class TemplateDataSource(object):
     self._intro_data_source = intro_data_source
     self._samples_data_source = samples_data_source
     self._api_data_source = api_data_source
-    self._sidenav_data_source = sidenav_data_source
     self._cache = cache
     self._public_template_path = public_template_path
     self._private_template_path = private_template_path
@@ -110,7 +103,6 @@ class TemplateDataSource(object):
       'api_list': self._api_list_data_source,
       'apis': self._api_data_source,
       'intros': self._intro_data_source,
-      'sidenavs': self._sidenav_data_source,
       'partials': self,
       'permissions': self._permissions_data_source,
       'samples': self._samples_data_source,