Update samples page. Replace buildbot sample with news one, since it

is more interesting.

Decided not to do full details on the other samples since they are
very similar to the ones we already have.

TBR=kathyw@google.com

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32505 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 78 insertions, 47 deletions

diff --git a/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json b/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json
index 344920f..ce2eccc 100755
--- a/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json
+++ b/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json
@@ -12,7 +12,7 @@
   ],
   "browser_action": {
       "name": "Display Map",
-      "icons": ["marker.png"],
-      "popup": { "path": "popup.html", "height": 512 }
+      "default_icon": "marker.png",
+      "popup": { "path": "popup.html" }
   }
 }
diff --git a/chrome/common/extensions/docs/images/news.png b/chrome/common/extensions/docs/images/news.png
new file mode 100755
index 0000000..624e07b
--- /dev/null
+++ b/chrome/common/extensions/docs/images/news.png
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index c742448..6e066ee 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -207,14 +207,21 @@
                 </li>
               </ol>
             </li><li>
-              <a href="#H2-1">Chromium Buildbot Monitor</a>
+              <a href="#H2-1">Subscribe in Feed Reader</a>
               <ol>
                 <li style="display: none; ">
                   <a>h3Name</a>
                 </li>
               </ol>
             </li><li>
-              <a href="#H2-2">Subscribe in Feed Reader</a>
+              <a href="#H2-2">News Reader</a>
+              <ol>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
+            </li><li>
+              <a href="#H2-3">Other samples</a>
               <ol>
                 <li style="display: none; ">
                   <a>h3Name</a>
@@ -265,7 +272,13 @@
         <!-- /TABLE OF CONTENTS -->
 
         <!-- STATIC CONTENT PLACEHOLDER -->
-        <div id="static"><div id="pageData-showTOC" class="pageData">true</div>
+        <div id="static"><style>
+a img {
+  border:0;
+}
+</style>
+
+<div id="pageData-showTOC" class="pageData">true</div>
 
 <p>
 This page shows some sample extensions,
@@ -289,8 +302,8 @@ For more example code, see the
 
 </p><p>Included with no charge is a swell animation when the number of unread items changes.
 
-</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US&amp;prod=chrome&amp;prodversion=4.0.238.0"><img src="images/google-mail-checker-capture.png" width="243" height="170" style="margin-bottom:0.5em"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US&amp;prod=chrome&amp;prodversion=4.0.238.0">Install</a>&nbsp;&nbsp;
+</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US"><img src="images/google-mail-checker-capture.png" width="243" height="170" style="margin-bottom:0.5em"></a><br>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/">Source code</a></b>
 
 <br><br>
@@ -306,47 +319,53 @@ For more example code, see the
 
 <br>
 
-<a name="H2-1"></a><h2>Chromium Buildbot Monitor</h2>
+<a name="H2-1"></a><h2>Subscribe in Feed Reader</h2>
 
-<p><a href="http://www.chromium.org/">Chromium</a> is the open source project behind Google Chrome. This extension monitors the status of the Chromium's continuous build and test suite. You can also click the icon to get more detailed information about the current status.
-
-</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US&amp;prod=chrome&amp;prodversion=4.0.238.0"><img src="images/buildbot-capture.png" style="margin-bottom:0.5em" width="336" height="288"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US&amp;prod=chrome&amp;prodversion=4.0.238.0">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/buildbot/">Source code</a></b>
+<p>Adds a small icon to the omnibox when a web page contains a feed that can be subscribed to. When you click the icon, present a preview of the feed and the option to subscribe in the web-based reader of your choice.
 
-<br><br>
+</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap1.png" style="margin-bottom:0.5em" width="342" height="165"></a>
 
+</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap2.png" style="margin-bottom:0.5em" width="566" height="327"></a><br>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/subscribe_page_action/">Source code</a></b>
 
+<br><br>
 </p><p>Features used:
 
 </p><ul>
-  <li><a href="browserAction.html">Browser action</a>
-  </li><li><a href="browserAction.html#popups">Popup</a>
+  <li><a href="pageAction.html">Page action</a>
+  </li><li><a href="background_pages.html">Background page</a>
+  </li><li><a href="content_scripts.html">Content scripts</a>
+  </li><li><a href="messaging.html">Message passing</a>
   </li><li><a href="xhr.html">Cross-origin XMLHttpRequest</a>
 </li></ul>
 
 <br>
 
-<a name="H2-2"></a><h2>Subscribe in Feed Reader</h2>
+<a name="H2-2"></a><h2>News Reader</h2>
 
-<p>Adds a small icon to the omnibox when a web page contains a feed that can be subscribed to. When you click the icon, present a preview of the feed and the option to subscribe in the web-based reader of your choice.
+<p>Displays the first 5 items from the 'Google News - top news' RSS feed in a popup. Also shows how a popup can dynamically resize itself to fit additional content.
 
-</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US&amp;prod=chrome&amp;prodversion=4.0.238.0"><img src="images/subscribe-cap1.png" style="margin-bottom:0.5em" width="342" height="165"></a>
+</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US"><img src="images/news.png" style="margin-bottom:0.5em" width="475" height="346"></a><br>
 
-</p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US&amp;prod=chrome&amp;prodversion=4.0.238.0"><img src="images/subscribe-cap2.png" style="margin-bottom:0.5em" width="566" height="327"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US&amp;prod=chrome&amp;prodversion=4.0.238.0">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/test/data/extensions/subscribe_page_action/">Source code</a></b>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
 
 <br><br>
 </p><p>Features used:
 
 </p><ul>
-  <li><a href="pageAction.html">Page action</a>
-  </li><li><a href="background_pages.html">Background page</a>
-  </li><li><a href="content_scripts.html">Content scripts</a>
-  </li><li><a href="messaging.html">Message passing</a>
+  <li><a href="browserAction.html">Browser action</a>
   </li><li><a href="xhr.html">Cross-origin XMLHttpRequest</a>
 </li></ul>
+
+<br>
+<a name="H2-3"></a><h2>Other samples</h2>
+<p>These samples use similar capabilities to the ones above, but to implement different features.</p>
+<ul>
+  <li><b>Chromium buildbot monitor</b>: Monitors the Chromium tree status. <a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source</a>
+  </li><li><b>Mappy</b>: Easily access a map for the first address on any web page. <a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dobjeacibkcphiplbghlbmlbnihbbmfjl%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/mappy/">Source</a>
+</li></ul>
 </div>
 
         <!-- API PAGE -->
diff --git a/chrome/common/extensions/docs/static/samples.html b/chrome/common/extensions/docs/static/samples.html
index 0f0a5fa..8a5c3d1 100644
--- a/chrome/common/extensions/docs/static/samples.html
+++ b/chrome/common/extensions/docs/static/samples.html
@@ -1,3 +1,9 @@
+<style>
+a img {
+  border:0;
+}
+</style>
+
 <div id="pageData-showTOC" class="pageData">true</div>
 
 <p>
@@ -22,8 +28,8 @@ For more example code, see the
 
 <p>Included with no charge is a swell animation when the number of unread items changes.
 
-<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US&prod=chrome&prodversion=4.0.238.0"><img src="images/google-mail-checker-capture.png" width="243" height="170" style="margin-bottom:0.5em"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US&prod=chrome&prodversion=4.0.238.0">Install</a>&nbsp;&nbsp;
+<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US"><img src="images/google-mail-checker-capture.png" width="243" height="170" style="margin-bottom:0.5em"></a><br>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/">Source code</a></b>
 
 <br><br>
@@ -39,44 +45,50 @@ For more example code, see the
 
 <br>
 
-<h2>Chromium Buildbot Monitor</h2>
-
-<p><a href="http://www.chromium.org/">Chromium</a> is the open source project behind Google Chrome. This extension monitors the status of the Chromium's continuous build and test suite. You can also click the icon to get more detailed information about the current status.
+<h2>Subscribe in Feed Reader</h2>
 
-<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US&prod=chrome&prodversion=4.0.238.0"><img src="images/buildbot-capture.png" style="margin-bottom:0.5em" width="336" height="288"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US&prod=chrome&prodversion=4.0.238.0">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/buildbot/">Source code</a></b>
+<p>Adds a small icon to the omnibox when a web page contains a feed that can be subscribed to. When you click the icon, present a preview of the feed and the option to subscribe in the web-based reader of your choice.
 
-<br><br>
+<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap1.png" style="margin-bottom:0.5em" width="342" height="165"></a>
 
+<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap2.png" style="margin-bottom:0.5em" width="566" height="327"></a><br>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/subscribe_page_action/">Source code</a></b>
 
+<br><br>
 <p>Features used:
 
 <ul>
-  <li><a href="browserAction.html">Browser action</a>
-  <li><a href="browserAction.html#popups">Popup</a>
+  <li><a href="pageAction.html">Page action</a>
+  <li><a href="background_pages.html">Background page</a>
+  <li><a href="content_scripts.html">Content scripts</a>
+  <li><a href="messaging.html">Message passing</a>
   <li><a href="xhr.html">Cross-origin XMLHttpRequest</a>
 </ul>
 
 <br>
 
-<h2>Subscribe in Feed Reader</h2>
+<h2>News Reader</h2>
 
-<p>Adds a small icon to the omnibox when a web page contains a feed that can be subscribed to. When you click the icon, present a preview of the feed and the option to subscribe in the web-based reader of your choice.
+<p>Displays the first 5 items from the 'Google News - top news' RSS feed in a popup. Also shows how a popup can dynamically resize itself to fit additional content.
 
-<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US&prod=chrome&prodversion=4.0.238.0"><img src="images/subscribe-cap1.png" style="margin-bottom:0.5em" width="342" height="165"></a>
+<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US"><img src="images/news.png" style="margin-bottom:0.5em" width="475" height="346"></a><br>
 
-<p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US&prod=chrome&prodversion=4.0.238.0"><img src="images/subscribe-cap2.png" style="margin-bottom:0.5em" width="566" height="327"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US&prod=chrome&prodversion=4.0.238.0">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/test/data/extensions/subscribe_page_action/">Source code</a></b>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
 
 <br><br>
 <p>Features used:
 
 <ul>
-  <li><a href="pageAction.html">Page action</a>
-  <li><a href="background_pages.html">Background page</a>
-  <li><a href="content_scripts.html">Content scripts</a>
-  <li><a href="messaging.html">Message passing</a>
+  <li><a href="browserAction.html">Browser action</a>
   <li><a href="xhr.html">Cross-origin XMLHttpRequest</a>
 </ul>
+
+<br>
+<h2>Other samples</h2>
+<p>These samples use similar capabilities to the ones above, but to implement different features.</p>
+<ul>
+  <li><b>Chromium buildbot monitor</b>: Monitors the Chromium tree status. <a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source</a>
+  <li><b>Mappy</b>: Easily access a map for the first address on any web page. <a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dobjeacibkcphiplbghlbmlbnihbbmfjl%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/mappy/">Source</a>
+</ul>