Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3803)

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

Issue 139303023: add GCS support to docs server (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated third party library, rebased and fixed a path issue caused by rebasing Created 6 years, 10 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
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 dca70ba91b9615861cb3a65f3d5589f622ad41a8..61ee914c9705ec30e1f3752018230315eda134cd 100644
--- a/chrome/common/extensions/docs/server2/server_instance.py
+++ b/chrome/common/extensions/docs/server2/server_instance.py
@@ -13,9 +13,10 @@ from document_renderer import DocumentRenderer
from empty_dir_file_system import EmptyDirFileSystem
from environment import IsDevServer
from features_bundle import FeaturesBundle
+from gcs_file_system_provider import CloudStorageFileSystemProvider
from github_file_system_provider import GithubFileSystemProvider
-from host_file_system_provider import HostFileSystemProvider
from host_file_system_iterator import HostFileSystemIterator
+from host_file_system_provider import HostFileSystemProvider
from object_store_creator import ObjectStoreCreator
from reference_resolver import ReferenceResolver
from samples_data_source import SamplesDataSource
@@ -33,6 +34,7 @@ class ServerInstance(object):
branch_utility,
host_file_system_provider,
github_file_system_provider,
+ gcs_file_system_provider,
base_path='/'):
'''
|object_store_creator|
@@ -61,6 +63,7 @@ class ServerInstance(object):
host_fs_at_trunk = host_file_system_provider.GetTrunk()
self.github_file_system_provider = github_file_system_provider
+ self.gcs_file_system_provider = gcs_file_system_provider
assert base_path.startswith('/') and base_path.endswith('/')
self.base_path = base_path
@@ -136,7 +139,8 @@ class ServerInstance(object):
self.content_providers = ContentProviders(
self.compiled_fs_factory,
host_fs_at_trunk,
- self.github_file_system_provider)
+ self.github_file_system_provider,
+ self.gcs_file_system_provider)
# TODO(kalman): Move all the remaining DataSources into DataSourceRegistry,
# then factor out the DataSource creation into a factory method, so that
@@ -170,6 +174,7 @@ class ServerInstance(object):
TestBranchUtility.CreateWithCannedData(),
file_system_provider,
GithubFileSystemProvider.ForEmpty(),
+ CloudStorageFileSystemProvider(object_store_creator),
base_path=base_path)
@staticmethod
@@ -183,4 +188,5 @@ class ServerInstance(object):
CompiledFileSystem.Factory(object_store_creator),
TestBranchUtility.CreateWithCannedData(),
host_file_system_provider,
- GithubFileSystemProvider.ForEmpty())
+ GithubFileSystemProvider.ForEmpty(),
+ CloudStorageFileSystemProvider(object_store_creator))

Powered by Google App Engine
This is Rietveld 408576698