Small tweaks to improve toolbar keyboard accessibility: Put focus rects...

chrome/browser/views/accessible_toolbar_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/frame/browser_view.h"
+#include "chrome/browser/views/location_bar/location_bar_view.h"
 #include "chrome/browser/views/accessible_toolbar_view.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_search.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 
 AccessibleToolbarView::AccessibleToolbarView()
     : toolbar_has_focus_(false),
@@ skipping 56 matching lines @@
   focus_manager_->AddFocusChangeListener(this);
 
   return true;
 }
 
 bool AccessibleToolbarView::SetToolbarFocusAndFocusDefault(
     int view_storage_id) {
   return SetToolbarFocus(view_storage_id, GetDefaultFocusableChild());
 }
 
-void AccessibleToolbarView::RemoveToolbarFocusIfNoChildHasFocus() {
-  views::View* focused_view = focus_manager_->GetFocusedView();
-  if (toolbar_has_focus_ && (!focused_view || !IsParentOf(focused_view)))
-    RemoveToolbarFocus();
-}
-
 void AccessibleToolbarView::RemoveToolbarFocus() {
   focus_manager_->RemoveFocusChangeListener(this);
   toolbar_has_focus_ = false;
 
   focus_manager_->UnregisterAccelerator(home_key_, this);
   focus_manager_->UnregisterAccelerator(end_key_, this);
   focus_manager_->UnregisterAccelerator(escape_key_, this);
   focus_manager_->UnregisterAccelerator(left_key_, this);
   focus_manager_->UnregisterAccelerator(right_key_, this);
 }
 
+void AccessibleToolbarView::RemoveToolbarFocusIfNoChildHasFocus() {
+  views::View* focused_view = focus_manager_->GetFocusedView();
+  if (toolbar_has_focus_ && (!focused_view || !IsParentOf(focused_view)))
+    RemoveToolbarFocus();
+}
+
 void AccessibleToolbarView::RestoreLastFocusedView() {
   views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
   views::View* last_focused_view =
       view_storage->RetrieveView(last_focused_view_storage_id_);
   if (last_focused_view) {
     focus_manager_->SetFocusedView(last_focused_view);
   } else {
     // Focus the location bar
     views::View* view = GetAncestorWithClassName(BrowserView::kViewClassName);
     if (view) {
@@ skipping 24 matching lines @@
 
 views::FocusTraversable* AccessibleToolbarView::GetPaneFocusTraversable() {
   if (toolbar_has_focus_)
     return this;
   else
     return NULL;
 }
 
 bool AccessibleToolbarView::AcceleratorPressed(
     const views::Accelerator& accelerator) {
-  // Special case: don't handle arrows for native views, like the
-  // location bar's edit text view, which needs them for text editing.
+  // Special case: don't handle arrows for certain views, like the
+  // location bar's edit text view, which need them for text editing.
   views::View* focused_view = focus_manager_->GetFocusedView();
-  if (focused_view->GetClassName() == views::NativeViewHost::kViewClassName &&
+  if ((focused_view->GetClassName() == LocationBarView::kViewClassName ||
+       focused_view->GetClassName() == views::NativeViewHost::kViewClassName) &&
       (accelerator.GetKeyCode() == base::VKEY_LEFT ||
        accelerator.GetKeyCode() == base::VKEY_RIGHT)) {
     return false;
   }
 
   switch (accelerator.GetKeyCode()) {
     case base::VKEY_ESCAPE:
       RemoveToolbarFocus();
       RestoreLastFocusedView();
       return true;
@@ skipping 60 matching lines @@
 
 views::FocusTraversable* AccessibleToolbarView::GetFocusTraversableParent() {
   DCHECK(toolbar_has_focus_);
   return NULL;
 }
 
 views::View* AccessibleToolbarView::GetFocusTraversableParentView() {
   DCHECK(toolbar_has_focus_);
   return NULL;
 }