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

chrome/browser/views/accessible_toolbar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_ACCESSIBLE_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_ACCESSIBLE_TOOLBAR_VIEW_H_
 
 #include "base/hash_tables.h"
 #include "base/task.h"
 #include "chrome/browser/views/accessibility_event_router_views.h"
@@ skipping 13 matching lines @@
                               public views::FocusTraversable {
  public:
   AccessibleToolbarView();
   virtual ~AccessibleToolbarView();
 
   // Set focus to the toolbar with complete keyboard access.
   // Focus will be restored to the ViewStorage with id |view_storage_id|
   // if the user escapes. If |initial_focus| is not NULL, that control will get
   // the initial focus, if it's enabled and focusable. Returns true if
   // the toolbar was able to receive focus.
-  bool SetToolbarFocus(int view_storage_id, View* initial_focus);
+  virtual bool SetToolbarFocus(int view_storage_id, View* initial_focus);
 
   // Set focus to the toolbar with complete keyboard access, with the
   // focus initially set to the default child. Focus will be restored
   // to the ViewStorage with id |view_storage_id| if the user escapes.
   // Returns true if the toolbar was able to receive focus.
-  bool SetToolbarFocusAndFocusDefault(int view_storage_id);
+  virtual bool SetToolbarFocusAndFocusDefault(int view_storage_id);
 
   // Overridden from views::View:
   virtual FocusTraversable* GetPaneFocusTraversable();
   virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
   virtual void SetVisible(bool flag);
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
 
   // Overridden from views::FocusChangeListener:
   virtual void FocusWillChange(View* focused_before,
                                View* focused_now);
 
   // Overridden from views::FocusTraversable:
   virtual views::FocusSearch* GetFocusSearch();
   virtual FocusTraversable* GetFocusTraversableParent();
   virtual View* GetFocusTraversableParentView();
 
  protected:
   // A subclass can override this to provide a default focusable child
   // other than the first focusable child.
   virtual views::View* GetDefaultFocusableChild() { return NULL; }
 
+  // Remove toolbar focus.
+  virtual void RemoveToolbarFocus();
+
   // Remove toolbar focus unless a child (including indirect children)
   // still has the focus.
   void RemoveToolbarFocusIfNoChildHasFocus();
 
-  void RemoveToolbarFocus();
-
   void RestoreLastFocusedView();
 
   View* GetFirstFocusableChild();
   View* GetLastFocusableChild();
 
   bool toolbar_has_focus_;
 
   ScopedRunnableMethodFactory<AccessibleToolbarView> method_factory_;
 
   // Save the focus manager rather than calling GetFocusManager(),
@@ skipping 12 matching lines @@
   views::Accelerator left_key_;
   views::Accelerator right_key_;
 
   // Last focused view that issued this traversal.
   int last_focused_view_storage_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibleToolbarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_ACCESSIBLE_TOOLBAR_VIEW_H_