A couple of accessibility-related updates/fixes.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/3599001

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

4 files changed, 42 insertions, 94 deletions

diff --git a/chrome/common/extensions/docs/a11y.html b/chrome/common/extensions/docs/a11y.html
index 7447813..c8e26469 100644
--- a/chrome/common/extensions/docs/a11y.html
+++ b/chrome/common/extensions/docs/a11y.html
@@ -556,13 +556,25 @@ Also check that any popups on page actions or browser actions
 are keyboard navigable. 
 </p>
 
+<p id="builtin">
+On Windows, you can use <b>Shift+Alt+T</b>
+to switch the keyboard focus to the toolbar,
+which lets you navigate to the icons of page actions and browser actions.
+The help topic
+<a href="http://www.google.com/support/chrome/bin/static.py?hl=en&amp;page=guide.cs&amp;guide=25799&amp;from=25799&amp;rd=1">Keyboard and mouse shortcuts</a>
+lists all of Google Chrome's keyboard shortcuts;
+details about toolbar navigation
+are in the section <b>Google Chrome feature shortcuts</b>.
+</p>
+
 <p class="note">
 <b>Note:</b>
-We're improving keyboard accessibility to Google Chrome's interface;
-keyboard navigation to the icons of page actions and browser actions
-is expected in Google Chrome 6.
-For details, see
-<a href="#builtin">Built-in toolbar navigation</a>.
+The Windows version of Google Chrome 6 was the first
+to support keyboard navigation to the toolbar.
+Support is also planned for Linux.
+On Mac OS X,
+access to the toolbar is provided through VoiceOver,
+Apple's screenreader.
 </p>
 
 <p>
@@ -578,48 +590,6 @@ Two examples of focus outline follow.
 <br>
 <img src="images/a11y/focus-outline.png" width="400" height="40" alt="A focus outline on one of a series of links">
 
-<h4 id="builtin"> Built-in toolbar navigation </h4>
-
-<p>
-Here are the keyboard shortcuts that we expect to be in Google Chrome 6.
-You can try them out now in the Dev channel.
-</p>
-
-<p>
-</p><table>
-  <tbody><tr>
-    <td> <b>Alt+Shift+T</b> </td>
-    <td> Focus on the first tool in the main toolbar. </td></tr>
-
-  <tr><td> <b>Tab</b>, <b>Shift+Tab</b>, <b>Home</b>, <b>End</b> </td>
-    <td> Move around in the toolbar,
-         including focusing on page actions and browser actions. </td></tr>
-
-  <tr><td> <b>Left&nbsp;arrow</b>, <b>Right&nbsp;arrow</b> </td>
-    <td> Move around in the toolbar,
-         unless you're in an edit box like the location bar,
-         where those keys are used for text editing. </td></tr>
-
-  <tr><td> <b>Space</b>, <b>Enter</b> </td>
-    <td> Activate toolbar buttons,
-         including page actions and browser actions. </td></tr>
-
-  <tr><td> <b>Context&nbsp;menu&nbsp;key</b>, <b>Shift+F10</b> </td>
-    <td> Open a toolbar button's context menu. </td></tr>
-
-  <tr><td> <b>Escape</b> </td>
-    <td> Return focus from the toolbar to the previous location. </td></tr>
-
-  <tr><td> <b>F6</b>, <b>Shift+F6</b> </td>
-    <td> Switch focus to the next keyboard-accessible pane,
-         where panes include the
-         main web content,
-         toolbar,
-         and bookmarks bar (if visible). </td></tr>
-
-</tbody></table>
-<p></p>
-
 
 <h3 id="shortcuts"> Shortcuts </h3>
 
diff --git a/chrome/common/extensions/docs/devguide.html b/chrome/common/extensions/docs/devguide.html
index e5a801b..298996e 100644
--- a/chrome/common/extensions/docs/devguide.html
+++ b/chrome/common/extensions/docs/devguide.html
@@ -368,6 +368,10 @@ and <a href="overview.html">Overview</a>.
     <td colspan="2"> &nbsp;</td>
   </tr>
   <tr>
+    <td> <a href="a11y.html">Accessibility (a11y)</a> </td>
+    <td> Make your extension accessible to people with disabilities </td>
+  </tr>
+  <tr>
     <td> <a href="background_pages.html">Background&nbsp;Pages</a> </td>
     <td> Put all the common code for your extension in a single place </td>
   </tr>
diff --git a/chrome/common/extensions/docs/static/a11y.html b/chrome/common/extensions/docs/static/a11y.html
index 4e20a8d..407a5d5 100644
--- a/chrome/common/extensions/docs/static/a11y.html
+++ b/chrome/common/extensions/docs/static/a11y.html
@@ -239,13 +239,25 @@ Also check that any popups on page actions or browser actions
 are keyboard navigable. 
 </p>
 
+<p id="builtin">
+On Windows, you can use <b>Shift+Alt+T</b>
+to switch the keyboard focus to the toolbar,
+which lets you navigate to the icons of page actions and browser actions.
+The help topic
+<a href="http://www.google.com/support/chrome/bin/static.py?hl=en&page=guide.cs&guide=25799&from=25799&rd=1">Keyboard and mouse shortcuts</a>
+lists all of Google Chrome's keyboard shortcuts;
+details about toolbar navigation
+are in the section <b>Google Chrome feature shortcuts</b>.
+</p>
+
 <p class="note">
 <b>Note:</b>
-We're improving keyboard accessibility to Google Chrome's interface;
-keyboard navigation to the icons of page actions and browser actions
-is expected in Google Chrome 6.
-For details, see
-<a href="#builtin">Built-in toolbar navigation</a>.
+The Windows version of Google Chrome 6 was the first
+to support keyboard navigation to the toolbar.
+Support is also planned for Linux.
+On Mac OS X,
+access to the toolbar is provided through VoiceOver,
+Apple's screenreader.
 </p>
 
 <p>
@@ -265,48 +277,6 @@ Two examples of focus outline follow.
   width="400" height="40"
   alt="A focus outline on one of a series of links">
 
-<h4 id="builtin"> Built-in toolbar navigation </h4>
-
-<p>
-Here are the keyboard shortcuts that we expect to be in Google Chrome 6.
-You can try them out now in the Dev channel.
-</p>
-
-<p>
-<table>
-  <tr>
-    <td> <b>Alt+Shift+T</b> </td>
-    <td> Focus on the first tool in the main toolbar. </td></tr>
-
-  <tr><td> <b>Tab</b>, <b>Shift+Tab</b>, <b>Home</b>, <b>End</b> </td>
-    <td> Move around in the toolbar,
-         including focusing on page actions and browser actions. </td></tr>
-
-  <tr><td> <b>Left&nbsp;arrow</b>, <b>Right&nbsp;arrow</b> </td>
-    <td> Move around in the toolbar,
-         unless you're in an edit box like the location bar,
-         where those keys are used for text editing. </td></tr>
-
-  <tr><td> <b>Space</b>, <b>Enter</b> </td>
-    <td> Activate toolbar buttons,
-         including page actions and browser actions. </td></tr>
-
-  <tr><td> <b>Context&nbsp;menu&nbsp;key</b>, <b>Shift+F10</b> </td>
-    <td> Open a toolbar button's context menu. </td></tr>
-
-  <tr><td> <b>Escape</b> </td>
-    <td> Return focus from the toolbar to the previous location. </td></tr>
-
-  <tr><td> <b>F6</b>, <b>Shift+F6</b> </td>
-    <td> Switch focus to the next keyboard-accessible pane,
-         where panes include the
-         main web content,
-         toolbar,
-         and bookmarks bar (if visible). </td></tr>
-
-</table>
-</p>
-
 
 <h3 id="shortcuts"> Shortcuts </h3>
 
diff --git a/chrome/common/extensions/docs/static/devguide.html b/chrome/common/extensions/docs/static/devguide.html
index 6b76694..cd9e44c 100644
--- a/chrome/common/extensions/docs/static/devguide.html
+++ b/chrome/common/extensions/docs/static/devguide.html
@@ -77,6 +77,10 @@ and <a href="overview.html">Overview</a>.
     <td colspan="2"> &nbsp;</td>
   </tr>
   <tr>
+    <td> <a href="a11y.html">Accessibility (a11y)</a> </td>
+    <td> Make your extension accessible to people with disabilities </td>
+  </tr>
+  <tr>
     <td> <a href="background_pages.html">Background&nbsp;Pages</a> </td>
     <td> Put all the common code for your extension in a single place </td>
   </tr>