summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/docs/server2/handler.py
diff options
context:
space:
mode:
authorcduvall@chromium.org <cduvall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 17:28:02 +0000
committercduvall@chromium.org <cduvall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 17:28:02 +0000
commit17610e0985e12858b9b862b16429adc63cc35cda (patch)
tree71940bcb260b84783872226e0fc4c90c27944d03 /chrome/common/extensions/docs/server2/handler.py
parentfb403c843a5b94a04fd4d68864aed3286cd0eaf9 (diff)
downloadchromium_src-17610e0985e12858b9b862b16429adc63cc35cda.zip
chromium_src-17610e0985e12858b9b862b16429adc63cc35cda.tar.gz
chromium_src-17610e0985e12858b9b862b16429adc63cc35cda.tar.bz2
Extensions Docs Server: Default apps to trunk
Extensions and apps docs now default to different branches. Also, the orange warning banner is no longer shown for apps, as specified in the bug. BUG=141993 Review URL: https://chromiumcodereview.appspot.com/10869018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/docs/server2/handler.py')
-rw-r--r--chrome/common/extensions/docs/server2/handler.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/common/extensions/docs/server2/handler.py b/chrome/common/extensions/docs/server2/handler.py
index f2f64ec..5e79f62 100644
--- a/chrome/common/extensions/docs/server2/handler.py
+++ b/chrome/common/extensions/docs/server2/handler.py
@@ -33,11 +33,14 @@ import url_constants
# The branch that the server will default to when no branch is specified in the
# URL. This is necessary because it is not possible to pass flags to the script
# handler.
-DEFAULT_BRANCH = 'local'
+# Production settings:
+# DEFAULT_BRANCHES = { 'extensions': 'stable', 'apps': 'trunk' }
+# Dev settings:
+DEFAULT_BRANCHES = { 'extensions': 'local', 'apps': 'local' }
BRANCH_UTILITY_MEMCACHE = InMemoryObjectStore('branch_utility')
BRANCH_UTILITY = BranchUtility(url_constants.OMAHA_PROXY_URL,
- DEFAULT_BRANCH,
+ DEFAULT_BRANCHES,
AppEngineUrlFetcher(None),
BRANCH_UTILITY_MEMCACHE)