Fix toolbar keyboard accessibility on Views (alternative impl).

ui/views/accessible_pane_view.h

 // Copyright (c) 2011 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 UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_
 #define UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 39 matching lines @@
   virtual void OnWillChangeFocus(View* focused_before,
                                  View* focused_now) OVERRIDE;
   virtual void OnDidChangeFocus(View* focused_before,
                                 View* focused_now) OVERRIDE;
 
   // Overridden from FocusTraversable:
   virtual FocusSearch* GetFocusSearch() OVERRIDE;
   virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE;
   virtual View* GetFocusTraversableParentView() OVERRIDE;
 
+  // For testing only.
+  const ui::Accelerator& home_key() const { return home_key_; }
+  const ui::Accelerator& end_key() const { return end_key_; }
+  const ui::Accelerator& escape_key() const { return escape_key_; }
+  const ui::Accelerator& left_key() const { return left_key_; }
+  const ui::Accelerator& right_key() const { return right_key_; }
+
  protected:
   // A subclass can override this to provide a default focusable child
   // other than the first focusable child.
   virtual View* GetDefaultFocusableChild();
 
+  // Returns the parent of |v|. Subclasses can override this if
+  // they need custom focus search behavior.
+  virtual View* GetParentForFocusSearch(View* v);
+
+  // Returns true if |v| is contained within the hierarchy rooted at |root|
+  // for the purpose of focus searching. Subclasses can override this if
+  // they need custom focus search behavior.
+  virtual bool ContainsForFocusSearch(View* root, const View* v);
+
   // Remove pane focus.
   virtual void RemovePaneFocus();
 
   void RestoreLastFocusedView();
 
   View* GetFirstFocusableChild();
   View* GetLastFocusableChild();
 
+  FocusManager* focus_manager() const { return focus_manager_; }
+
+ private:
   bool pane_has_focus_;
 
   base::WeakPtrFactory<AccessiblePaneView> method_factory_;
 
   // Save the focus manager rather than calling GetFocusManager(),
   // so that we can remove focus listeners in the destructor.
   FocusManager* focus_manager_;
 
   // Our custom focus search implementation that traps focus in this
   // pane and traverses all views that are focusable for accessibility,
   // not just those that are normally focusable.
   scoped_ptr<FocusSearch> focus_search_;
 
   // Registered accelerators
   ui::Accelerator home_key_;
   ui::Accelerator end_key_;
   ui::Accelerator escape_key_;
   ui::Accelerator left_key_;
   ui::Accelerator right_key_;
 
+  friend class AccessiblePaneViewFocusSearch;
+
   DISALLOW_COPY_AND_ASSIGN(AccessiblePaneView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_