Add info about impending keyboard shortcuts.

TEST=none
BUG=none

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

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

2 files changed, 92 insertions, 2 deletions

diff --git a/chrome/common/extensions/docs/a11y.html b/chrome/common/extensions/docs/a11y.html
index 2c787f5..9ab18dc 100644
--- a/chrome/common/extensions/docs/a11y.html
+++ b/chrome/common/extensions/docs/a11y.html
@@ -525,7 +525,9 @@ are keyboard navigable.
 <b>Note:</b>
 We're improving keyboard accessibility to Google Chrome's interface;
 keyboard navigation to the icons of page actions and browser actions
-will be coming soon.
+is expected in Google Chrome 6.
+For details, see
+<a href="#builtin">Built-in toolbar navigation</a>.
 </p>
 
 <p>
@@ -541,6 +543,49 @@ 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>
 
 <p>
diff --git a/chrome/common/extensions/docs/static/a11y.html b/chrome/common/extensions/docs/static/a11y.html
index dd53151..4e20a8d 100644
--- a/chrome/common/extensions/docs/static/a11y.html
+++ b/chrome/common/extensions/docs/static/a11y.html
@@ -243,7 +243,9 @@ are keyboard navigable.
 <b>Note:</b>
 We're improving keyboard accessibility to Google Chrome's interface;
 keyboard navigation to the icons of page actions and browser actions
-will be coming soon.
+is expected in Google Chrome 6.
+For details, see
+<a href="#builtin">Built-in toolbar navigation</a>.
 </p>
 
 <p>
@@ -263,6 +265,49 @@ 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>
 
 <p>