Views: Change View::RequestFocus to respect keyboard accessibility.

ui/views/focus/focus_manager_unittest.cc

 // Copyright (c) 2012 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 "ui/views/focus/focus_manager.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 780 matching lines @@
 
   GetFocusManager()->StoreFocusedView(false);
   EXPECT_EQ(nullptr, GetFocusManager()->GetFocusedView());
 
   // Turn on full keyboard access mode and restore focused view. Since view3 is
   // still focusable, view3 should have focus.
   GetFocusManager()->SetKeyboardAccessible(true);
   EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
   EXPECT_EQ(view3, GetFocusManager()->GetFocusedView());
 }
+
+// Test that View::RequestFocus() respects full keyboard access mode.
+TEST_F(FocusManagerTest, RequestFocus) {
+  View* view1 = new View();
+  View* view2 = new View();
+
+  // Make view1 always focusable, view2 only focusable in accessibility mode.
+  view1->SetFocusBehavior(View::FocusBehavior::ALWAYS);
+  view2->SetFocusBehavior(View::FocusBehavior::ACCESSIBLE_ONLY);
+
+  // Adds views to the view hierarchy.
+  GetWidget()->GetRootView()->AddChildView(view1);
+  GetWidget()->GetRootView()->AddChildView(view2);
+
+  // Verify view1 can always get focus via View::RequestFocus, while view2 can
+  // only get focus in full keyboard accessibility mode.
+  EXPECT_TRUE(GetFocusManager()->keyboard_accessible());
+  view1->RequestFocus();
+  EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
+  view2->RequestFocus();
+  EXPECT_EQ(view2, GetFocusManager()->GetFocusedView());
+
+  // Toggle full keyboard accessibility.
+  GetFocusManager()->SetKeyboardAccessible(false);
+
+  GetFocusManager()->ClearFocus();
+  EXPECT_NE(view1, GetFocusManager()->GetFocusedView());
+  view1->RequestFocus();
+  EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
+  view2->RequestFocus();
+  EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
+}
+
 #endif
 
 namespace {
 
 // Trivial WidgetDelegate implementation that allows setting return value of
 // ShouldAdvanceFocusToTopLevelWidget().
 class AdvanceFocusWidgetDelegate : public WidgetDelegate {
  public:
   explicit AdvanceFocusWidgetDelegate(Widget* widget)
       : widget_(widget),
@@ skipping 64 matching lines @@
   EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
 
   // Allow focus to go to the parent, and focus backwards which should now move
   // up |widget_view| (in the parent).
   delegate->set_should_advance_focus_to_parent(true);
   GetFocusManager()->AdvanceFocus(true);
   EXPECT_EQ(widget_view, GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views