chrome/common/extensions/docs/server2/instance_servlet.py - Issue 15087006: Docserver: there is only one.

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/instance_servlet.py

Issue 15087006: Docserver: there is only one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: epic rebase 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:

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

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

index 2016e324972e7dff553654ee70d3cd96f534dd2a..0382ce485b1f637d0b0e20eb1fb6df5bec446909 100644

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

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

@@ -32,23 +32,21 @@ class _OfflineRenderServletDelegate(RenderServlet.Delegate):

self._delegate = delegate

@memoize

- def CreateServerInstanceForChannel(self, channel):

- object_store_creator = ObjectStoreCreator(channel, start_empty=False)

+ def CreateServerInstance(self):

+ object_store_creator = ObjectStoreCreator(start_empty=False)

branch_utility = self._delegate.CreateBranchUtility(object_store_creator)

host_file_system_creator = self._delegate.CreateHostFileSystemCreator(

object_store_creator)

- host_file_system = host_file_system_creator.Create(

- branch_utility.GetChannelInfo(channel).branch)

+ host_file_system = host_file_system_creator.Create()

app_samples_file_system = self._delegate.CreateAppSamplesFileSystem(

object_store_creator)

compiled_host_fs_factory = CompiledFileSystem.Factory(

host_file_system,

object_store_creator)

- return ServerInstance(channel,

- object_store_creator,

+ return ServerInstance(object_store_creator,

host_file_system,

app_samples_file_system,

- '' if channel == 'stable' else '/%s' % channel,

+ '',

compiled_host_fs_factory,

branch_utility,

host_file_system_creator)