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

ui/views/focus/focus_search.cc

 // Copyright (c) 2011 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.
 
 #include "base/logging.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/view.h"
 
 namespace views {
@@ skipping 26 matching lines @@
 
   if (!starting_view) {
     // Default to the first/last child
     starting_view = reverse ? root_->child_at(root_->child_count() - 1) :
         root_->child_at(0);
     // If there was no starting view, then the one we select is a potential
     // focus candidate.
     check_starting_view = true;
   } else {
     // The starting view should be a direct or indirect child of the root.
-    DCHECK(root_->Contains(starting_view));
+    DCHECK(Contains(root_, starting_view));
   }
 
   View* v = NULL;
   if (!reverse) {
     v = FindNextFocusableViewImpl(starting_view, check_starting_view,
                                   true,
                                   (direction == DOWN) ? true : false,
                                   starting_view_group,
                                   focus_traversable,
                                   focus_traversable_view);
   } else {
     // If the starting view is focusable, we don't want to go down, as we are
     // traversing the view hierarchy tree bottom-up.
     bool can_go_down = (direction == DOWN) && !IsFocusable(starting_view);
     v = FindPreviousFocusableViewImpl(starting_view, check_starting_view,
                                       true,
                                       can_go_down,
                                       starting_view_group,
                                       focus_traversable,
                                       focus_traversable_view);
   }
 
   // Don't set the focus to something outside of this view hierarchy.
-  if (v && v != root_ && !root_->Contains(v))
+  if (v && v != root_ && !Contains(root_, v))
     v = NULL;
 
   // If |cycle_| is true, prefer to keep cycling rather than returning NULL.
   if (cycle_ && !v && initial_starting_view) {
     v = FindNextFocusableView(NULL, reverse, direction, check_starting_view,
                               focus_traversable, focus_traversable_view);
     DCHECK(IsFocusable(v));
     return v;
   }
 
@@ skipping 29 matching lines @@
 
   View* selected_view = view->GetSelectedViewForGroup(view->GetGroup());
   if (selected_view)
     return selected_view;
 
   // No view selected for that group, default to the specified view.
   return view;
 }
 
 View* FocusSearch::GetParent(View* v) {
-  return root_->Contains(v) ? v->parent() : NULL;
+  return Contains(root_, v) ? v->parent() : NULL;
+}
+
+bool FocusSearch::Contains(View* root, const View* v) {
+  return root->Contains(v);
 }
 
 // Strategy for finding the next focusable view:
 // - keep going down the first child, stop when you find a focusable view or
 //   a focus traversable view (in that case return it) or when you reach a view
 //   with no children.
 // - go to the right sibling and start the search from there (by invoking
 //   FindNextFocusableViewImpl on that view).
 // - if the view has no right sibling, go up the parents until you find a parent
 //   with a right sibling and start the search from there.
@@ skipping 40 matching lines @@
                                         true, false, true, skip_group_id,
                                         focus_traversable,
                                         focus_traversable_view);
     if (v || *focus_traversable)
       return v;
   }
 
   // Then go up to the parent sibling.
   if (can_go_up) {
     View* parent = GetParent(starting_view);
-    while (parent) {
+    while (parent && parent != root_) {
       sibling = parent->GetNextFocusableView();
       if (sibling) {
         return FindNextFocusableViewImpl(sibling,
                                          true, true, true,
                                          skip_group_id,
                                          focus_traversable,
                                          focus_traversable_view);
       }
       parent = GetParent(parent);
     }
@@ skipping 69 matching lines @@
                                            skip_group_id,
                                            focus_traversable,
                                            focus_traversable_view);
   }
 
   // We found nothing.
   return NULL;
 }
 
 }  // namespace views