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

chrome/browser/views/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 "chrome/browser/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 131 matching lines @@
                                      views::Event::EF_MIDDLE_BUTTON_DOWN);
   home_->set_tag(IDC_HOME);
   home_->SetTooltipText(l10n_util::GetString(IDS_TOOLTIP_HOME));
   home_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_HOME));
   home_->SetID(VIEW_ID_HOME_BUTTON);
 
   // Have to create this before |reload_| as |reload_|'s constructor needs it.
   location_bar_ = new LocationBarView(profile, browser_->command_updater(),
       model_, this, (display_mode_ == DISPLAYMODE_LOCATION) ?
           LocationBarView::POPUP : LocationBarView::NORMAL);
-  location_bar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_LOCATION));
 
   reload_ = new ReloadButton(location_bar_, browser_);
   reload_->set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN |
                                        views::Event::EF_MIDDLE_BUTTON_DOWN);
   reload_->set_tag(IDC_RELOAD);
   reload_->SetTooltipText(l10n_util::GetString(IDS_TOOLTIP_RELOAD));
   reload_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_RELOAD));
   reload_->SetID(VIEW_ID_RELOAD_BUTTON);
 
   browser_actions_ = new BrowserActionsContainer(browser_, this, true);
@@ skipping 106 matching lines @@
   // location bar entry view, like we do when we switch to full screen mode in
   // BrowserView::ProcessFullscreen. Otherwise the text view can appear floating
   // on top of web content.
   if (collapsed_)
     location_bar_->PushForceHidden();
   else
     location_bar_->PopForceHidden();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// ToolbarView, AccessibleToolbarView overrides:
+
+bool ToolbarView::SetToolbarFocus(
+    int view_storage_id, views::View* initial_focus) {
+  if (!AccessibleToolbarView::SetToolbarFocus(view_storage_id, initial_focus))
+    return false;
+
+  location_bar_->set_show_focus_rect(true);
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, Menu::BaseControllerDelegate overrides:
 
 bool ToolbarView::GetAcceleratorInfo(int id, menus::Accelerator* accel) {
   return GetWidget()->GetAccelerator(id, accel);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::MenuDelegate implementation:
 
 void ToolbarView::RunMenu(views::View* source, const gfx::Point& pt) {
@@ skipping 270 matching lines @@
     canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1);
 }
 
 void ToolbarView::ThemeChanged() {
   LoadImages();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, protected:
 
+// Override this so that when the user presses F6 to rotate toolbar panes,
+// the location bar gets focus, not the first control in the toolbar.
 views::View* ToolbarView::GetDefaultFocusableChild() {
   return location_bar_;
 }
 
+void ToolbarView::RemoveToolbarFocus() {
+  AccessibleToolbarView::RemoveToolbarFocus();
+  location_bar_->set_show_focus_rect(false);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, private:
 
 int ToolbarView::PopupTopSpacing() const {
   return GetWindow()->GetNonClientView()->UseNativeFrame() ?
       0 : kPopupTopSpacingNonGlass;
 }
 
 void ToolbarView::LoadImages() {
   ThemeProvider* tp = GetThemeProvider();
@@ skipping 198 matching lines @@
   }
 #endif
 
   // Tell the menu button to activate, opening its pop-up menu.
   menu_button->Activate();
 
 #if defined(OS_WIN)
   SetToolbarFocus(NULL, menu_button);
 #endif
 }