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

chrome/browser/ui/views/toolbar_view.h

 // Copyright (c) 2012 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_UI_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
 
 #include <set>
 #include <string>
 
@@ skipping 155 matching lines @@
   // above and below them.
   static const int kStandardSpacing;
   // The top of the toolbar has an edge we have to skip over in addition to the
   // standard spacing.
   static const int kVertSpacing;
 
  protected:
   // Overridden from AccessiblePaneView
   virtual bool SetPaneFocusAndFocusDefault() OVERRIDE;
   virtual void RemovePaneFocus() OVERRIDE;
+  virtual View* GetParentForFocusSearch(View* v) OVERRIDE;
+  virtual bool ContainsForFocusSearch(View* root, const View* v) OVERRIDE;
 
  private:
   // Types of display mode this toolbar can have.
   enum DisplayMode {
     DISPLAYMODE_NORMAL,       // Normal toolbar with buttons, etc.
     DISPLAYMODE_LOCATION      // Slimline toolbar showing only compact location
                               // bar, used for popups.
   };
 
   // Returns true if we should show the upgrade recommended dot.
@@ skipping 57 matching lines @@
 
   // A list of listeners to call when the menu opens.
   ObserverList<views::MenuListener> menu_listeners_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_