Extension docs: Include sidenav in 404 pages

chrome/common/extensions/docs/server2/render_servlet.py

Index: chrome/common/extensions/docs/server2/render_servlet.py
===================================================================
--- chrome/common/extensions/docs/server2/render_servlet.py	(revision 201930)
+++ chrome/common/extensions/docs/server2/render_servlet.py	(working copy)
@@ -90,7 +90,13 @@
 
     headers = {'x-frame-options': 'sameorigin'}
     if content is None:
-      return Response.NotFound(templates.Render('404'), headers=headers)
+      doc_class = path.split('/', 1)[0]
+      content = templates.Render(doc_class + '/404')
+      if not content:
+        content = templates.Render('extensions/404')
+      if not content:
+        content = templates.Render('404')

[not at google - send to devlin, 2013/05/24 16:58:29]

third branch here seems unnecessary. we should always have an extensions/404,
you can assert that it's there.

and delete the top-level 404.html. I believe there is also a reference to it in
the integration test.

[方觉(Fang Jue), 2013/05/25 00:08:39]

Yes. It's unnecessary. But before the new 404 templates are merged to stable,
beta, dev, it's not yet always true.

Another choice is to increase the mid version in app.yaml. It seems that
revision pinning also works with branches?

The integration test tries to request 'extensions/notfound.html' and there's no
reference to it. (anyway, presubmit passed)

[not at google - send to devlin, 2013/05/28 14:53:37]

Yes revision pinning works with branches too. Let's do that - remove the third
branch then I can merge this patch through.

+      return Response.NotFound(content, headers=headers)
 
     if not content:
       logging.error('%s had empty content' % path)