Fix toolbar keyboard accessibility on Views (alternative impl).

chrome/browser/ui/views/toolbar_view.cc

 // Copyright (c) 2012 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/ui/views/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
@@ skipping 227 matching lines @@
   forward_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                         ui::EF_MIDDLE_MOUSE_BUTTON);
   forward_->set_tag(IDC_FORWARD);
   forward_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD));
   forward_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD));
   forward_->set_id(VIEW_ID_FORWARD_BUTTON);
 
   // Have to create this before |reload_| as |reload_|'s constructor needs it.
   location_bar_container_ = new LocationBarContainer(
       location_bar_parent,
+      this,
       chrome::search::IsInstantExtendedAPIEnabled(browser_->profile()));
   location_bar_ = new LocationBarView(
       browser_,
       browser_->profile(),
       browser_->command_controller()->command_updater(),
       model_,
       this,
       browser_->search_model(),
       (display_mode_ == DISPLAYMODE_LOCATION) ?
           LocationBarView::POPUP : LocationBarView::NORMAL);
@@ skipping 40 matching lines @@
   LoadImages();
 
   // Always add children in order from left to right, for accessibility.
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
   AddChildView(browser_actions_);
   AddChildView(app_menu_);
 
+  // Put the location bar container between the home button and browser
+  // actions when doing a focus search.
+  home_->SetNextFocusableView(location_bar_container_);
+  location_bar_container_->SetNextFocusableView(browser_actions_);
+
   location_bar_->Init(popup_parent_view);
   show_home_button_.Init(prefs::kShowHomeButton,
                          browser_->profile()->GetPrefs(), this);
   browser_actions_->Init();
 
   // Accessibility specific tooltip text.
   if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) {
     back_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK));
     forward_->SetTooltipText(
@@ skipping 538 matching lines @@
 
 void ToolbarView::OnThemeChanged() {
   LoadImages();
 }
 
 std::string ToolbarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool ToolbarView::AcceleratorPressed(const ui::Accelerator& accelerator) {
-  const views::View* focused_view = focus_manager_->GetFocusedView();
+  const views::View* focused_view = focus_manager()->GetFocusedView();
   if (focused_view == location_bar_)
     return false;  // Let location bar handle all accelerator events.
   return AccessiblePaneView::AcceleratorPressed(accelerator);
 }
 
 bool ToolbarView::IsWrenchMenuShowing() const {
   return wrench_menu_.get() && wrench_menu_->IsShowing();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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 - and
 // also so that it selects all content in the location bar.
 bool ToolbarView::SetPaneFocusAndFocusDefault() {
   if (!location_bar_->HasFocus()) {
+    SetPaneFocus(location_bar_);
     location_bar_->FocusLocation(true);
     return true;
   }
 
   if (!AccessiblePaneView::SetPaneFocusAndFocusDefault())
     return false;
   browser_->window()->RotatePaneFocus(true);
   return true;
 }
 
 void ToolbarView::RemovePaneFocus() {
   AccessiblePaneView::RemovePaneFocus();
   location_bar_->SetShowFocusRect(false);
 }
 
+views::View* ToolbarView::GetParentForFocusSearch(views::View* v) {
+  if (v == location_bar_container_)
+    return this;
+
+  return AccessiblePaneView::GetParentForFocusSearch(v);
+}
+
+bool ToolbarView::ContainsForFocusSearch(views::View* root,
+                                         const views::View* v) {
+  if (Contains(root) && location_bar_container_->Contains(v))
+    return true;
+
+  return AccessiblePaneView::ContainsForFocusSearch(root, v);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, private:
 
 bool ToolbarView::ShouldShowUpgradeRecommended() {
 #if defined(OS_CHROMEOS)
   // In chromeos, the update recommendation is shown in the system tray. So it
   // should not be displayed in the wrench menu.
   return false;
 #else
   return (UpgradeDetector::GetInstance()->notify_upgrade());
@@ skipping 79 matching lines @@
   // LocationBarContainer is not a child of the ToolbarView.
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToTarget(this, location_bar_container_->parent(),
                                     &origin);
   gfx::Rect target_bounds(origin, bounds.size());
   if (location_bar_container_->GetTargetBounds() != target_bounds) {
     location_bar_container_->SetInToolbar(true);
     location_bar_container_->SetBoundsRect(target_bounds);
   }
 }