Merge 157914 - Fix toolbar keyboard accessibility on Views (alternative impl).

chrome/browser/ui/views/location_bar/location_bar_container.h

Index: chrome/browser/ui/views/location_bar/location_bar_container.h
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_container.h	(revision 158380)
+++ chrome/browser/ui/views/location_bar/location_bar_container.h	(working copy)
@@ -13,6 +13,8 @@
 class LocationBarView;
 
 namespace views {
+class AccessiblePaneView;
+class FocusTraversable;
 class NativeViewHost;
 }
 
@@ -25,8 +27,11 @@
 class LocationBarContainer : public views::View,
                              public views::BoundsAnimatorObserver {
  public:
-  // Creates a new LocationBarContainer as a child of |parent|.
-  LocationBarContainer(views::View* parent, bool instant_extended_api_enabled);
+  // Creates a new LocationBarContainer as a child of |parent|,
+  // with |accessible_pane_view| as the owning view for focus searching.
+  LocationBarContainer(views::View* parent,
+                       views::AccessiblePaneView* accessible_pane_view,
+                       bool instant_extended_api_enabled);
   virtual ~LocationBarContainer();
 
   // Sets whether the LocationBarContainer is in the toolbar.
@@ -56,6 +61,7 @@
   virtual bool SkipDefaultKeyEventProcessing(
       const ui::KeyEvent& event) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual views::FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
 
   // views::BoundsAnimatorObserver overrides:
   virtual void OnBoundsAnimatorProgressed(
@@ -87,6 +93,8 @@
 
   bool in_toolbar_;
 
+  views::AccessiblePaneView* accessible_pane_view_;
+
   bool instant_extended_api_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarContainer);