fix nits

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

1 files changed, 15 insertions, 6 deletions

diff --git a/chrome/browser/views/accessible_toolbar_view.cc b/chrome/browser/views/accessible_toolbar_view.cc
index f18baf1..425d699 100644
--- a/chrome/browser/views/accessible_toolbar_view.cc
+++ b/chrome/browser/views/accessible_toolbar_view.cc
@@ -53,9 +53,8 @@ int AccessibleToolbarView::GetNextAccessibleViewIndex(int view_index,
     current_view_index += modifier;
   }
 
-  // No button is available in the specified direction, the accessible view
-  // remains in |view_index| position.
-  return view_index;
+  // No button is available in the specified direction.
+  return -1;
 }
 
 bool AccessibleToolbarView::IsAccessibleViewTraversable(views::View* view) {
@@ -156,7 +155,7 @@ bool AccessibleToolbarView::OnKeyPressed(const views::KeyEvent& e) {
   }
 
   // No buttons enabled, visible, or focus hasn't moved.
-  if (next_view == -1 || next_view == focused_view)
+  if (next_view == -1)
     return false;
 
   // Remove hot-tracking from old focused button.
@@ -215,9 +214,9 @@ bool AccessibleToolbarView::SkipDefaultKeyEventProcessing(
     }
     case base::VKEY_TAB: {
       if (e.IsShiftDown()) {
-        browser_view->TraverseNextAccessibleToolbar(true);
-      } else {
         browser_view->TraverseNextAccessibleToolbar(false);
+      } else {
+        browser_view->TraverseNextAccessibleToolbar(true);
       }
       return true;
     }
@@ -241,6 +240,16 @@ void AccessibleToolbarView::SetAccessibleName(const std::wstring& name) {
   accessible_name_ = name;
 }
 
+void AccessibleToolbarView::ViewHierarchyChanged(bool is_add, View* parent,
+                                                 View* child) {
+  // When the toolbar is removed, traverse to the next accessible toolbar.
+  if (!is_add && parent->GetClassName() == BrowserView::kViewClassName) {
+    // Given the check above, we can ensure its a BrowserView.
+    BrowserView* browser_view = static_cast<BrowserView*>(parent);
+    browser_view->TraverseNextAccessibleToolbar(true);
+  }
+}
+
 void AccessibleToolbarView::SetFocusToAccessibleView() {
   // Hot-track new focused button.
   selected_focused_view_->SetHotTracked(true);