views: Rename IsFocusableInRootView() to just IsFocusable().

BUG=105879
R=ben@chromium.org

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

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

6 files changed, 8 insertions, 10 deletions

diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 8a6e5c5..56e97f9 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -108,7 +108,7 @@ static View* GetFirstFocusableView(View* view, int start, bool forward) {
         return deepest;
     }
   }
-  return view->IsFocusableInRootView() ? view : NULL;
+  return view->IsFocusable() ? view : NULL;
 }
 
 // Returns the first child of |start| that is focusable.
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index ca2a55f..b1db57b 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -297,8 +297,7 @@ void FocusManager::RestoreFocusedView() {
   View* view = view_storage->RetrieveView(stored_focused_view_storage_id_);
   if (view) {
     if (ContainsView(view)) {
-      if (!view->IsFocusableInRootView() &&
-          view->IsAccessibilityFocusableInRootView()) {
+      if (!view->IsFocusable() && view->IsAccessibilityFocusableInRootView()) {
         // 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 56ec02f..f6b3e96 100644
--- a/ui/views/focus/focus_search.cc
+++ b/ui/views/focus/focus_search.cc
@@ -102,7 +102,7 @@ bool FocusSearch::IsFocusable(View* v) {
   if (accessibility_mode_)
     return v && v->IsAccessibilityFocusableInRootView();
 
-  return v && v->IsFocusableInRootView();
+  return v && v->IsFocusable();
 }
 
 View* FocusSearch::FindSelectedViewForGroup(View* view) {
diff --git a/ui/views/focus/focus_search.h b/ui/views/focus/focus_search.h
index 50ba6f8..508111b5 100644
--- a/ui/views/focus/focus_search.h
+++ b/ui/views/focus/focus_search.h
@@ -36,7 +36,7 @@ class VIEWS_EXPORT FocusSearch {
   //           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 IsFocusableInRootView().
+  //   rather than IsFocusable().
   FocusSearch(View* root, bool cycle, bool accessibility_mode);
   virtual ~FocusSearch() {}
 
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 244f261..f260e37 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -894,7 +894,7 @@ void View::SetNextFocusableView(View* view) {
   next_focusable_view_ = view;
 }
 
-bool View::IsFocusableInRootView() const {
+bool View::IsFocusable() const {
   return focusable_ && enabled_ && IsDrawn();
 }
 
@@ -914,7 +914,7 @@ const FocusManager* View::GetFocusManager() const {
 
 void View::RequestFocus() {
   FocusManager* focus_manager = GetFocusManager();
-  if (focus_manager && IsFocusableInRootView())
+  if (focus_manager && IsFocusable())
     focus_manager->SetFocusedView(this);
 }
 
diff --git a/ui/views/view.h b/ui/views/view.h
index 15aeb38..7dbd96c 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -669,9 +669,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
   // Returns true if this view is capable of taking focus.
   bool focusable() const { return focusable_ && enabled_ && visible_; }
 
-  // Returns true if the view is focusable (IsFocusable) and visible in the root
-  // view. See also IsFocusable.
-  virtual bool IsFocusableInRootView() const;
+  // Returns true if this view is |focusable_|, |enabled_| and drawn.
+  virtual bool IsFocusable() const;
 
   // Return whether this view is focusable when the user requires full keyboard
   // access, even though it may not be normally focusable.