views: Rename IsAccessibilityFocusableInRootView() to just IsAccessibilityFocusable().

BUG=105879
R=ben@chromium.org

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

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

3 files changed, 5 insertions, 7 deletions

diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index b1db57b..d6d1c1e 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -297,7 +297,7 @@ void FocusManager::RestoreFocusedView() {
   View* view = view_storage->RetrieveView(stored_focused_view_storage_id_);
   if (view) {
     if (ContainsView(view)) {
-      if (!view->IsFocusable() && view->IsAccessibilityFocusableInRootView()) {
+      if (!view->IsFocusable() && view->IsAccessibilityFocusable()) {
         // RequestFocus would fail, but we want to restore focus to controls
         // that had focus in accessibility mode.
         SetFocusedViewWithReason(view, kReasonFocusRestore);
diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc
index f6b3e96..b461ec9 100644
--- a/ui/views/focus/focus_search.cc
+++ b/ui/views/focus/focus_search.cc
@@ -100,8 +100,7 @@ bool FocusSearch::IsViewFocusableCandidate(View* v, int skip_group_id) {
 
 bool FocusSearch::IsFocusable(View* v) {
   if (accessibility_mode_)
-    return v && v->IsAccessibilityFocusableInRootView();
-
+    return v && v->IsAccessibilityFocusable();
   return v && v->IsFocusable();
 }
 
diff --git a/ui/views/focus/focus_search.h b/ui/views/focus/focus_search.h
index 508111b5..3f938d6 100644
--- a/ui/views/focus/focus_search.h
+++ b/ui/views/focus/focus_search.h
@@ -35,8 +35,8 @@ class VIEWS_EXPORT FocusSearch {
   //           view to FindNextFocusableView you will always get a valid view
   //           out, even if it's the same view.
   // - |accessibility_mode| should be true if full keyboard accessibility is
-  //   needed and you  want to check IsAccessibilityFocusableInRootView(),
-  //   rather than IsFocusable().
+  //   needed and you want to check IsAccessibilityFocusable(), rather than
+  //   IsFocusable().
   FocusSearch(View* root, bool cycle, bool accessibility_mode);
   virtual ~FocusSearch() {}
 
@@ -75,8 +75,7 @@ class VIEWS_EXPORT FocusSearch {
   bool IsViewFocusableCandidate(View* v, int skip_group_id);
 
   // Convenience method; returns true if a view is not NULL and is focusable
-  // (checking IsAccessibilityFocusableInRootView() if accessibility_mode_ is
-  // true).
+  // (checking IsAccessibilityFocusable() if |accessibility_mode_| is true).
   bool IsFocusable(View* v);
 
   // Returns the view selected for the group of the selected view. If the view