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

chrome/browser/views/toolbar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "base/ref_counted.h"
@@ skipping 69 matching lines @@
   GoButton* GetGoButton() { return go_; }
 
   LocationBarView* GetLocationBarView() const { return location_bar_; }
 
   // Updates the toolbar (and transitively the location bar) with the states of
   // the specified |tab|.  If |should_restore_state| is true, we're switching
   // (back?) to this tab and should restore any previous location bar state
   // (such as user editing) as well.
   void Update(TabContents* tab, bool should_restore_state);
 
-  void OnInputInProgress(bool in_progress);
+  virtual void OnInputInProgress(bool in_progress);
+
+  // Returns a brief, identifying string, containing a unique, readable name.
+  virtual bool GetAccessibleName(std::wstring* name);
 
   // Returns the MSAA role of the current view. The role is what assistive
   // technologies (ATs) use to determine what behavior to expect from a given
   // control.
-  bool GetAccessibleRole(VARIANT* role);
-
-  // Returns a brief, identifying string, containing a unique, readable name.
-  bool GetAccessibleName(std::wstring* name);
+  virtual bool GetAccessibleRole(VARIANT* role);
 
   // Assigns an accessible string name.
-  void SetAccessibleName(const std::wstring& name);
+  virtual void SetAccessibleName(const std::wstring& name);
+
+  virtual View* GetAccFocusedChildView() { return acc_focused_view_; }
 
   // Returns the index of the next view of the toolbar, starting from the given
   // view index (skipping the location bar), in the given navigation direction
   // (nav_left true means navigation right to left, and vice versa). -1 finds
   // first accessible child, based on the above policy.
   int GetNextAccessibleViewIndex(int view_index, bool nav_left);
 
-  views::View* acc_focused_view() {
-    return acc_focused_view_;
-  }
-
   void set_acc_focused_view(views::View* acc_focused_view) {
     acc_focused_view_ = acc_focused_view;
   }
 
   // Returns the selected tab.
   virtual TabContents* GetTabContents();
 
   Browser* browser() { return browser_; }
 
   // Overridden from CommandUpdater::CommandObserver:
@@ skipping 84 matching lines @@
   scoped_refptr<GetProfilesHelper> profiles_helper_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
   DisplayMode display_mode_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_