chrome/common/extensions/docs/server2/server_instance.py - Issue 18323018: Linking AvailabilityFinder with APIDataSource and intro-table templates.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/docs/server2/server_instance.py

Issue 18323018: Linking AvailabilityFinder with APIDataSource and intro-table templates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase with master Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/extensions/docs/server2/intro_data_source_test.py ('k') | chrome/common/extensions/docs/server2/template_data_source_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/server2/server_instance.py

diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py

index adfe91b3db098d6887e08ad99e37362dabf4a1c6..251cee51ccba83db9c49f683ffe6ab2cf176bc8f 100644

--- a/chrome/common/extensions/docs/server2/server_instance.py

+++ b/chrome/common/extensions/docs/server2/server_instance.py

@@ -70,7 +70,8 @@ class ServerInstance(object):

self.api_data_source_factory = APIDataSource.Factory(

self.compiled_host_fs_factory,

- svn_constants.API_PATH)

+ svn_constants.API_PATH,

+ self.availability_finder_factory)

self.ref_resolver_factory = ReferenceResolver.Factory(

self.api_data_source_factory,

@@ -122,6 +123,9 @@ class ServerInstance(object):

svn_constants.PRIVATE_TEMPLATE_PATH,

base_path)

+ self.api_data_source_factory.SetTemplateDataSource(

+ self.template_data_source_factory)

self.example_zipper = ExampleZipper(

self.compiled_host_fs_factory,

svn_constants.DOCS_PATH)

@@ -161,8 +165,7 @@ class ServerInstance(object):

store_type=TestObjectStore)

host_file_system_creator = HostFileSystemCreator.ForLocal(

object_store_creator)

- trunk_file_system = host_file_system_creator.Create(

- 'trunk')

+ trunk_file_system = host_file_system_creator.Create('trunk')

return ServerInstance(

channel,

object_store_creator,