Enables restoring of keyboard focus to the the toolbar button that last had f...

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 325 matching lines @@
     sz = page_menu_->GetPreferredSize();
     page_menu_->SetBounds(page_x, kControlVertOffset, sz.width(),
                           go_->height());
     sz = app_menu_->GetPreferredSize();
     app_menu_->SetBounds(page_menu_->x() + page_menu_->width(),
                          page_menu_->y(), sz.width(), go_->height());
   }
 }
 
 void BrowserToolbarView::DidGainFocus() {
-  // Find first accessible child (-1 for start search at parent).
-  int first_acc_child = GetNextAccessibleViewIndex(-1, false);
+  // Check to see if MSAA focus should be restored to previously focused button,
+  // and if button is an enabled, visibled child of toolbar.
+  if (!acc_focused_view() ||
+      (acc_focused_view()->GetParent()->GetID() != VIEW_ID_TOOLBAR) ||
+      !acc_focused_view()->IsEnabled() ||
+      !acc_focused_view()->IsVisible()) {
+    // Find first accessible child (-1 to start search at parent).
+    int first_acc_child = GetNextAccessibleViewIndex(-1, false);
 
-  // No buttons enabled or visible.
-  if (first_acc_child == -1)
-    return;
+    // No buttons enabled or visible.
+    if (first_acc_child == -1)
+      return;
 
-  acc_focused_view_ = GetChildViewAt(first_acc_child);
+    set_acc_focused_view(GetChildViewAt(first_acc_child));
+  }
 
   // Default focus is on the toolbar.
   int view_index = VIEW_ID_TOOLBAR;
 
   // Set hot-tracking for child, and update focused_view for MSAA focus event.
-  if (acc_focused_view_) {
-    acc_focused_view_->SetHotTracked(true);
+  if (acc_focused_view()) {
+    acc_focused_view()->SetHotTracked(true);
 
     // Show the tooltip for the view that got the focus.
     if (GetWidget()->GetTooltipManager())
       GetWidget()->GetTooltipManager()->ShowKeyboardTooltip(acc_focused_view_);
 
     // Update focused_view with MSAA-adjusted child id.
-    view_index = acc_focused_view_->GetID();
+    view_index = acc_focused_view()->GetID();
   }
 
   HWND hwnd = GetWidget()->GetHWND();
 
   // Notify Access Technology that there was a change in keyboard focus.
   ::NotifyWinEvent(EVENT_OBJECT_FOCUS, hwnd, OBJID_CLIENT,
                    static_cast<LONG>(view_index));
 }
 
 void BrowserToolbarView::WillLoseFocus() {
   // Resetting focus state.
   acc_focused_view_->SetHotTracked(false);
   // Any tooltips that are active should be hidden when toolbar loses focus.
   if (GetWidget() && GetWidget()->GetTooltipManager())
     GetWidget()->GetTooltipManager()->HideKeyboardTooltip();
-  acc_focused_view_ = NULL;
 }

[jcampan, 2008/12/20 02:20:11]

I think I saw a case where the button was still showing as hot-tracked.
Shouldn't we unset the hot tracking on the acc_focused_view if any?

 
 bool BrowserToolbarView::OnKeyPressed(const views::KeyEvent& e) {
   // Paranoia check, button should be initialized upon toolbar gaining focus.
   if (!acc_focused_view_)
     return false;
 
   int focused_view = GetChildIndex(acc_focused_view_);
   int next_view = focused_view;
 
   switch (e.GetCharacter()) {
@@ skipping 372 matching lines @@
       *accel = views::Accelerator(L'C', false, true, false);
       return true;
     case IDC_PASTE:
       *accel = views::Accelerator(L'V', false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(id, accel);
 }