Improve toolbar keyboard accessibility.

Design doc: https://docs.google.com/a/google.com/Doc?docid=0ATICCjR-gNReY2djdjkyNnNfNzl4ZnpiODQ2Mg&hl=en
BUG=40745
BUG=36728
BUG=36222
TEST=New test added to focus_manager_unittest.cc

Review URL: http://codereview.chromium.org/2737010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50234 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 10 deletions

diff --git a/views/widget/root_view.h b/views/widget/root_view.h
index ba1d5d22..280742f 100644
--- a/views/widget/root_view.h
+++ b/views/widget/root_view.h
@@ -10,6 +10,7 @@
 
 #include "base/ref_counted.h"
 #include "views/focus/focus_manager.h"
+#include "views/focus/focus_search.h"
 #include "views/view.h"
 
 #if defined(OS_LINUX)
@@ -104,10 +105,6 @@ class RootView : public View,
   // Make the provided view focused. Also make sure that our Widget is focused.
   void FocusView(View* view);
 
-  // Check whether the provided view is in the focus path. The focus path is the
-  // path between the focused view (included) to the root view.
-  bool IsInFocusPath(View* view);
-
   // Returns the View in this RootView hierarchy that has the focus, or NULL if
   // no View currently has the focus.
   View* GetFocusedView();
@@ -138,12 +135,7 @@ class RootView : public View,
   virtual bool IsVisibleInRootView() const;
 
   // FocusTraversable implementation.
-  virtual View* FindNextFocusableView(View* starting_view,
-                                      bool reverse,
-                                      Direction direction,
-                                      bool check_starting_view,
-                                      FocusTraversable** focus_traversable,
-                                      View** focus_traversable_view);
+  virtual FocusSearch* GetFocusSearch();
   virtual FocusTraversable* GetFocusTraversableParent();
   virtual View* GetFocusTraversableParentView();
 
@@ -285,6 +277,9 @@ class RootView : public View,
   // The host Widget
   Widget* widget_;
 
+  // The focus search algorithm.
+  FocusSearch focus_search_;
+
   // The rectangle that should be painted
   gfx::Rect invalid_rect_;