chrome/common/extensions/docs/server2/server_instance.py - Issue 437323003: Docserver: Factor SamplesModel out of SamplesDataSource

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 437323003: Docserver: Factor SamplesModel out of SamplesDataSource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 4 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/samples_model_test.py ('k') | chrome/common/extensions/docs/server2/template_renderer.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 6d3deee83c621984a2c864ded2eea72f3fb8fc01..a7908214816e846da9b408c124d3af2bd2f385c3 100644

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

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

@@ -73,25 +73,8 @@ class ServerInstance(object):

self.compiled_fs_factory,

host_fs_at_trunk,

self.host_file_system_iterator,

- self.object_store_creator)

- # Note: samples are super slow in the dev server because it doesn't support

- # async fetch, so disable them.

- if IsDevServer():

- extension_samples_fs = EmptyDirFileSystem()

- app_samples_fs = EmptyDirFileSystem()

- else:

- extension_samples_fs = host_fs_at_trunk

- # TODO(kalman): Re-enable the apps samples, see http://crbug.com/344097.

- app_samples_fs = EmptyDirFileSystem()

- #app_samples_fs = github_file_system_provider.Create(

- # 'GoogleChrome', 'chrome-app-samples')

- self.samples_data_source_factory = SamplesDataSource.Factory(

- extension_samples_fs,

- app_samples_fs,

- CompiledFileSystem.Factory(object_store_creator),

- self.platform_bundle,

- base_path)

+ self.object_store_creator,

+ self.base_path)

self.content_providers = ContentProviders(

object_store_creator,