views: Rename IsAccessibilityFocusableInRootView() to just IsAccessib…

…ilityFocusable(). 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
Denger-Network · Dec 23, 2011 · 7419e36 · 7419e36
1 parent 9be08e1
commit 7419e36
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/chrome/browser/chromeos/views/dropdown_button.cc b/chrome/browser/chromeos/views/dropdown_button.cc
@@ -71,7 +71,7 @@ DropDownButton::~DropDownButton() {
 }
 
 void DropDownButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus() && (focusable() || IsAccessibilityFocusableInRootView())) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     canvas->DrawFocusRect(gfx::Rect(kFocusFrameLeftOffset, kFocusFrameTopOffset,
                                     width() - kFocusFrameRightOffset,
                                     height() - kFocusFrameBottomOffset));

diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc
@@ -61,7 +61,7 @@ void Checkbox::GetAccessibleState(ui::AccessibleViewState* state) {
 }
 
 void Checkbox::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus() && (focusable() || IsAccessibilityFocusableInRootView())) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     gfx::Rect bounds(GetTextBounds());
     // Increate the bounding box by one on each side so that that focus border
     // does not draw on top of the letters.

diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
@@ -753,7 +753,7 @@ std::string TextButton::GetClassName() const {
 }
 
 void TextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if ((focusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     gfx::Rect rect(GetLocalBounds());
     rect.Inset(kFocusRectInset, kFocusRectInset);
     canvas->DrawFocusRect(rect);
@@ -841,7 +841,7 @@ std::string NativeTextButton::GetClassName() const {
 
 void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
 #if defined(OS_WIN)
-  if ((focusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     gfx::Rect rect(GetLocalBounds());
     rect.Inset(kFocusRectInset, kFocusRectInset);
     canvas->DrawFocusRect(rect);

diff --git 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
@@ -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
@@ -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

diff --git a/ui/views/view.cc b/ui/views/view.cc
@@ -898,7 +898,7 @@ bool View::IsFocusable() const {
   return focusable_ && enabled_ && IsDrawn();
 }
 
-bool View::IsAccessibilityFocusableInRootView() const {
+bool View::IsAccessibilityFocusable() const {
   return (focusable_ || accessibility_focusable_) && enabled_ && IsDrawn();
 }
 
@@ -1093,7 +1093,7 @@ void View::OnPaintBorder(gfx::Canvas* canvas) {
 }
 
 void View::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if ((focusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     TRACE_EVENT2("views", "views::OnPaintFocusBorder",
                  "width", canvas->GetSkCanvas()->getDevice()->width(),
                  "height", canvas->GetSkCanvas()->getDevice()->height());

diff --git a/ui/views/view.h b/ui/views/view.h
@@ -674,7 +674,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
 
   // Return whether this view is focusable when the user requires full keyboard
   // access, even though it may not be normally focusable.
-  bool IsAccessibilityFocusableInRootView() const;
+  bool IsAccessibilityFocusable() const;
 
   // Set whether this view can be made focusable if the user requires
   // full keyboard access, even though it's not normally focusable.