diff options
author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 01:10:20 +0000 |
---|---|---|
committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 01:10:20 +0000 |
commit | e76049f366a8ffd17708d8915d7d3881b35d53a4 (patch) | |
tree | f67b5e9ae2b681c087f1dd20c2d5809145283393 | |
parent | 3f2b909c01efe578d66be408453be01fe932f430 (diff) | |
download | chromium_src-e76049f366a8ffd17708d8915d7d3881b35d53a4.zip chromium_src-e76049f366a8ffd17708d8915d7d3881b35d53a4.tar.gz chromium_src-e76049f366a8ffd17708d8915d7d3881b35d53a4.tar.bz2 |
Extension Doc Changes (no building or testable changes)
This fixes a minor issue with test_shell error output making it back into the doc pages.
TBR=aa,kathyw
Review URL: http://codereview.chromium.org/515048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35324 0039d316-1c4b-4281-b951-d872f2087c98
35 files changed, 3 insertions, 38 deletions
diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html index 5f990b7..e2fc0b6 100644 --- a/chrome/common/extensions/docs/api_index.html +++ b/chrome/common/extensions/docs/api_index.html @@ -460,4 +460,3 @@ For more information, see the video </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/api_other.html b/chrome/common/extensions/docs/api_other.html index d98de52..ce68cba 100644 --- a/chrome/common/extensions/docs/api_other.html +++ b/chrome/common/extensions/docs/api_other.html @@ -496,4 +496,3 @@ just as they would in any other web pages. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/autoupdate.html b/chrome/common/extensions/docs/autoupdate.html index ab60edc..1f99f13 100644 --- a/chrome/common/extensions/docs/autoupdate.html +++ b/chrome/common/extensions/docs/autoupdate.html @@ -572,4 +572,3 @@ Another option is to use the --extensions-update-frequency command-line flag to </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/background_pages.html b/chrome/common/extensions/docs/background_pages.html index 0f8a8cc..3a8369f 100644 --- a/chrome/common/extensions/docs/background_pages.html +++ b/chrome/common/extensions/docs/background_pages.html @@ -567,4 +567,3 @@ from a file named <code>image.html</code>. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/bookmarks.html b/chrome/common/extensions/docs/bookmarks.html index 2b9c4dd..99eb8d2 100644 --- a/chrome/common/extensions/docs/bookmarks.html +++ b/chrome/common/extensions/docs/bookmarks.html @@ -3834,4 +3834,3 @@ For a full example of using bookmarks, see the </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html index 7753957..923de47 100644 --- a/chrome/common/extensions/docs/browserAction.html +++ b/chrome/common/extensions/docs/browserAction.html @@ -1368,4 +1368,3 @@ For other examples and for help in viewing the source code, see </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/build/build.py b/chrome/common/extensions/docs/build/build.py index c44bf8a..08970c5 100755 --- a/chrome/common/extensions/docs/build/build.py +++ b/chrome/common/extensions/docs/build/build.py @@ -29,6 +29,7 @@ _page_shell_html = _template_dir + "/page_shell.html" _generator_html = _build_dir + "/generator.html" _expected_output_preamble = "<!DOCTYPE html>" +_expected_output_postamble = "</body></html>" # HACK! This is required because we can only depend on python 2.4 and # the calling environment may not be setup to set the PYTHONPATH @@ -63,6 +64,7 @@ def RenderPage(name, test_shell): result = p.stdout.read() content_start = result.find(_expected_output_preamble) + content_end = result.find(_expected_output_postamble) if (content_start < 0): if (result.startswith("#TEST_TIMED_OUT")): raise Exception("test_shell returned TEST_TIMED_OUT.\n" + @@ -73,7 +75,7 @@ def RenderPage(name, test_shell): "\nAnd open it in chrome using the file: scheme.\n" + "Look from javascript errors via the inspector.") raise Exception("test_shell returned unexpected output: " + result) - result = result[content_start:] + result = result[content_start:content_end + len(_expected_output_postamble)] + "\n" # remove the trailing #EOF that test shell appends to the output. result = result.replace('#EOF', '') diff --git a/chrome/common/extensions/docs/content_scripts.html b/chrome/common/extensions/docs/content_scripts.html index 1eef989..4b77dda 100644 --- a/chrome/common/extensions/docs/content_scripts.html +++ b/chrome/common/extensions/docs/content_scripts.html @@ -771,6 +771,3 @@ sending a request to its parent extension. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - -Blocked access to external URL http://www.youtube.com/v/B4M_a7xejYI&hl=en_US&fs=1& -Blocked access to external URL http://www.youtube.com/v/laLudeUmXHM&hl=en_US&fs=1& diff --git a/chrome/common/extensions/docs/devguide.html b/chrome/common/extensions/docs/devguide.html index 0088847..83a3010 100644 --- a/chrome/common/extensions/docs/devguide.html +++ b/chrome/common/extensions/docs/devguide.html @@ -543,4 +543,3 @@ and <a href="overview.html">Overview</a>. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/devtools.html b/chrome/common/extensions/docs/devtools.html index 5679008..3e68a67 100644 --- a/chrome/common/extensions/docs/devtools.html +++ b/chrome/common/extensions/docs/devtools.html @@ -431,4 +431,3 @@ </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/docs.html b/chrome/common/extensions/docs/docs.html index 17dc127c451..5d7e49b 100644 --- a/chrome/common/extensions/docs/docs.html +++ b/chrome/common/extensions/docs/docs.html @@ -564,4 +564,3 @@ The following table lists the doc locations and explains how they differ. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/events.html b/chrome/common/extensions/docs/events.html index 147f1ff..ceadf87 100644 --- a/chrome/common/extensions/docs/events.html +++ b/chrome/common/extensions/docs/events.html @@ -477,4 +477,3 @@ bool hasListener(function callback(...)) </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html index 537bca3..6c66b71 100644 --- a/chrome/common/extensions/docs/extension.html +++ b/chrome/common/extensions/docs/extension.html @@ -2472,4 +2472,3 @@ For details, see </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/faq.html b/chrome/common/extensions/docs/faq.html index c03936b..47da125 100644 --- a/chrome/common/extensions/docs/faq.html +++ b/chrome/common/extensions/docs/faq.html @@ -617,4 +617,3 @@ try the </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/getstarted.html b/chrome/common/extensions/docs/getstarted.html index 9b626e14..49ad393 100644 --- a/chrome/common/extensions/docs/getstarted.html +++ b/chrome/common/extensions/docs/getstarted.html @@ -621,4 +621,3 @@ Here are some suggestions for what to do next: </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/hosting.html b/chrome/common/extensions/docs/hosting.html index 7315431..1f33922 100644 --- a/chrome/common/extensions/docs/hosting.html +++ b/chrome/common/extensions/docs/hosting.html @@ -493,4 +493,3 @@ or try hosting the extension at another server. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/i18n.html b/chrome/common/extensions/docs/i18n.html index b771f0e..6848eee 100644 --- a/chrome/common/extensions/docs/i18n.html +++ b/chrome/common/extensions/docs/i18n.html @@ -742,4 +742,3 @@ For other examples and for help in viewing the source code, see </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/index.html b/chrome/common/extensions/docs/index.html index 4a37774..b86d3a6 100644 --- a/chrome/common/extensions/docs/index.html +++ b/chrome/common/extensions/docs/index.html @@ -558,5 +558,3 @@ and subscribe to the </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - -Blocked access to external URL http://www.youtube.com/p/CA101D6A85FE9D4B&hl=en_US&fs=1 diff --git a/chrome/common/extensions/docs/manifest.html b/chrome/common/extensions/docs/manifest.html index bd0a90f..8383376 100644 --- a/chrome/common/extensions/docs/manifest.html +++ b/chrome/common/extensions/docs/manifest.html @@ -650,4 +650,3 @@ For more information, see </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/match_patterns.html b/chrome/common/extensions/docs/match_patterns.html index c1becb6..3a9f21a 100644 --- a/chrome/common/extensions/docs/match_patterns.html +++ b/chrome/common/extensions/docs/match_patterns.html @@ -621,4 +621,3 @@ Here are some examples of <em>invalid</em> pattern matches: </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/messaging.html b/chrome/common/extensions/docs/messaging.html index 069439c..2d2b042 100644 --- a/chrome/common/extensions/docs/messaging.html +++ b/chrome/common/extensions/docs/messaging.html @@ -703,4 +703,3 @@ chrome.tabs.sendRequest(tab.id, {greeting: "hello"}, function(response) { </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/npapi.html b/chrome/common/extensions/docs/npapi.html index 58b4614..91885dd 100644 --- a/chrome/common/extensions/docs/npapi.html +++ b/chrome/common/extensions/docs/npapi.html @@ -528,4 +528,3 @@ avoid making your NPAPI plugin public whenever possible. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/options.html b/chrome/common/extensions/docs/options.html index d69cd05..21566a2 100644 --- a/chrome/common/extensions/docs/options.html +++ b/chrome/common/extensions/docs/options.html @@ -520,4 +520,3 @@ Favorite Color: </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/override.html b/chrome/common/extensions/docs/override.html index 1ab2703..d8b875b 100644 --- a/chrome/common/extensions/docs/override.html +++ b/chrome/common/extensions/docs/override.html @@ -576,4 +576,3 @@ For other examples and for help in viewing the source code, see </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/overview.html b/chrome/common/extensions/docs/overview.html index 76a2001..d4fbd8d 100644 --- a/chrome/common/extensions/docs/overview.html +++ b/chrome/common/extensions/docs/overview.html @@ -770,4 +770,3 @@ Here are some ideas for where to go next: </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/packaging.html b/chrome/common/extensions/docs/packaging.html index e48c243..7b2237e 100644 --- a/chrome/common/extensions/docs/packaging.html +++ b/chrome/common/extensions/docs/packaging.html @@ -612,4 +612,3 @@ See the following page for details: </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/pageAction.html b/chrome/common/extensions/docs/pageAction.html index b858153..6dcfaf5 100644 --- a/chrome/common/extensions/docs/pageAction.html +++ b/chrome/common/extensions/docs/pageAction.html @@ -1177,4 +1177,3 @@ For other examples and for help in viewing the source code, see </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html index c7c4070..4aa72ac 100644 --- a/chrome/common/extensions/docs/samples.html +++ b/chrome/common/extensions/docs/samples.html @@ -595,4 +595,3 @@ put a star by bug <a href="http://code.google.com/p/chromium/issues/detail?id=25 </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html index dd6491a..0b2f4f9 100644 --- a/chrome/common/extensions/docs/tabs.html +++ b/chrome/common/extensions/docs/tabs.html @@ -4932,4 +4932,3 @@ For other examples and for help in viewing the source code, see </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/test.html b/chrome/common/extensions/docs/test.html index df2c635..5d6fe0a 100644 --- a/chrome/common/extensions/docs/test.html +++ b/chrome/common/extensions/docs/test.html @@ -726,4 +726,3 @@ </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/themes.html b/chrome/common/extensions/docs/themes.html index 40ee98156..38833fb 100644 --- a/chrome/common/extensions/docs/themes.html +++ b/chrome/common/extensions/docs/themes.html @@ -589,4 +589,3 @@ Community-written documentation to help you write themes is here: </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/tut_debugging.html b/chrome/common/extensions/docs/tut_debugging.html index 3c5c787..c1fc5e9 100644 --- a/chrome/common/extensions/docs/tut_debugging.html +++ b/chrome/common/extensions/docs/tut_debugging.html @@ -750,4 +750,3 @@ of Getting Started. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/tutorials.html b/chrome/common/extensions/docs/tutorials.html index bf39cf6..3fadd28 100644 --- a/chrome/common/extensions/docs/tutorials.html +++ b/chrome/common/extensions/docs/tutorials.html @@ -441,4 +441,3 @@ Here's what we have, so far: </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/windows.html b/chrome/common/extensions/docs/windows.html index 1bcfa26..c974b12 100644 --- a/chrome/common/extensions/docs/windows.html +++ b/chrome/common/extensions/docs/windows.html @@ -2538,4 +2538,3 @@ the value of the current window falls back to the topmost window. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - diff --git a/chrome/common/extensions/docs/xhr.html b/chrome/common/extensions/docs/xhr.html index 6f7b767..e320325 100644 --- a/chrome/common/extensions/docs/xhr.html +++ b/chrome/common/extensions/docs/xhr.html @@ -580,4 +580,3 @@ prefer HTTPS whenever possible. </div> <!-- /gc-footer --> </div> <!-- /gc-container --> </body></html> - |