Fix toolbar keyboard focus (shift-alt-t), which was broken by me, and toolbar...

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 340 matching lines @@
   // For glass, we need to draw a black line below the location bar to separate
   // it from the content area.  For non-glass, the NonClientView draws the
   // toolbar background below the location bar for us.
   if (win_util::ShouldUseVistaFrame())
     canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1);
 }
 
 void BrowserToolbarView::DidGainFocus() {
   // 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()) {
+  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;
 
     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() {
-  if (acc_focused_view()) {
+  if (acc_focused_view_) {
     // Resetting focus state.
-    acc_focused_view()->SetHotTracked(false);
+    acc_focused_view_->SetHotTracked(false);
   }
   // Any tooltips that are active should be hidden when toolbar loses focus.
   if (GetWidget() && GetWidget()->GetTooltipManager())
     GetWidget()->GetTooltipManager()->HideKeyboardTooltip();
 }
 
 bool BrowserToolbarView::OnKeyPressed(const views::KeyEvent& e) {
   // Paranoia check, button should be initialized upon toolbar gaining focus.
   if (!acc_focused_view_)
     return false;
@@ skipping 257 matching lines @@
         IDC_SELECT_PROFILE, l10n_util::GetString(IDS_SELECT_PROFILE));
   }
 
   // Always show a link to select a new profile.
   profiles_menu_->AppendSeparator();
   profiles_menu_->AppendMenuItemWithLabel(
       IDC_NEW_PROFILE,
       l10n_util::GetString(IDS_SELECT_PROFILE_DIALOG_NEW_PROFILE_ENTRY));
 }
 
+bool BrowserToolbarView::GetAccessibleName(std::wstring* name) {
+  if (!accessible_name_.empty()) {
+    (*name).assign(accessible_name_);
+    return true;
+  }
+  return false;
+}
+
 bool BrowserToolbarView::GetAccessibleRole(VARIANT* role) {
   DCHECK(role);
 
   role->vt = VT_I4;
   role->lVal = ROLE_SYSTEM_TOOLBAR;
   return true;
 }
 
-bool BrowserToolbarView::GetAccessibleName(std::wstring* name) {
-  if (!accessible_name_.empty()) {
-    (*name).assign(accessible_name_);
-    return true;
-  }
-  return false;
-}
-
 void BrowserToolbarView::SetAccessibleName(const std::wstring& name) {
   accessible_name_.assign(name);
 }
 
 int BrowserToolbarView::GetNextAccessibleViewIndex(int view_index,
                                                    bool nav_left) {
   int modifier = 1;
 
   if (nav_left)
     modifier = -1;
@@ skipping 13 matching lines @@
     // Update view_index with the available button index found.
     view_index = current_view_index;
     break;
   }
   // Returns the next available button index, or if no button is available in
   // the specified direction, remains where it was.
   return view_index;
 }
 
 void BrowserToolbarView::ShowContextMenu(int x, int y, bool is_mouse_gesture) {
-  if (GetAccFocusedChildView())
-    GetAccFocusedChildView()->ShowContextMenu(x, y, is_mouse_gesture);
+  if (acc_focused_view_)
+    acc_focused_view_->ShowContextMenu(x, y, is_mouse_gesture);
 }
 
 int BrowserToolbarView::GetDragOperations(views::View* sender, int x, int y) {
   DCHECK(sender == star_);
   if (model_->input_in_progress() || !tab_ || !tab_->ShouldDisplayURL() ||
       !tab_->GetURL().is_valid()) {
     return DragDropTypes::DRAG_NONE;
   }
   if (profile_ && profile_->GetBookmarkModel() &&
       profile_->GetBookmarkModel()->IsBookmarked(tab_->GetURL())) {
@@ skipping 89 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);
 }