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

Unified Diff: chrome/common/extensions/docs/server2/sidenav_data_source.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/docs/server2/sidenav_data_source.py
diff --git a/chrome/common/extensions/docs/server2/sidenav_data_source.py b/chrome/common/extensions/docs/server2/sidenav_data_source.py
index 98d7fd28ce31b838fbe30d3a1a6fab31b0238336..bf467279358331ae30678d03e41ec38400352222 100644
--- a/chrome/common/extensions/docs/server2/sidenav_data_source.py
+++ b/chrome/common/extensions/docs/server2/sidenav_data_source.py
@@ -13,21 +13,17 @@ class SidenavDataSource(object):
menu.
"""
class Factory(object):
- def __init__(self, compiled_fs_factory, json_path, base_path):
+ def __init__(self, compiled_fs_factory, json_path):
self._cache = compiled_fs_factory.Create(self._CreateSidenavDict,
SidenavDataSource)
self._json_path = json_path
- self._base_path = base_path
def Create(self, path):
"""Create a SidenavDataSource, binding it to |path|. |path| is the url
of the page that is being rendered. It is used to determine which item
in the sidenav should be highlighted.
"""
- return SidenavDataSource(self._cache,
- self._json_path,
- path,
- self._base_path)
+ return SidenavDataSource(self._cache, self._json_path, path)
def _AddLevels(self, items, level):
"""Levels represent how deeply this item is nested in the sidenav. We
@@ -43,11 +39,10 @@ class SidenavDataSource(object):
self._AddLevels(items, 2);
return items
- def __init__(self, cache, json_path, path, base_path):
+ def __init__(self, cache, json_path, path):
self._cache = cache
self._json_path = json_path
self._href = '/' + path
- self._file_dir = base_path
def _AddSelected(self, items):
for item in items:
@@ -70,7 +65,7 @@ class SidenavDataSource(object):
if not href.startswith('/'):
logging.warn('Paths in sidenav must be qualified. %s is not.' % href)
href = '/' + href
- item['href'] = '%s%s' % (self._file_dir, href)
+ item['href'] = href
def get(self, key):
sidenav = copy.deepcopy(self._cache.GetFromFile(
« no previous file with comments | « chrome/common/extensions/docs/server2/servlet.py ('k') | chrome/common/extensions/docs/server2/sidenav_data_source_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698