MacViews: Implement Full Keyboard Access.

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 25 matching lines @@
   }
 
   FocusTestEventType type;
   int view_id;
 };
 
 class SimpleTestView : public View {
  public:
   SimpleTestView(std::vector<FocusTestEvent>* event_list, int view_id)
       : event_list_(event_list) {
-    SetFocusable(true);
+    SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
     set_id(view_id);
   }
 
   void OnFocus() override {
     event_list_->push_back(FocusTestEvent(ON_FOCUS, id()));
   }
 
   void OnBlur() override {
     event_list_->push_back(FocusTestEvent(ON_BLUR, id()));
   }
@@ skipping 31 matching lines @@
 
   event_list.clear();
   GetFocusManager()->ClearFocus();
   ASSERT_EQ(1, static_cast<int>(event_list.size()));
   EXPECT_EQ(ON_BLUR, event_list[0].type);
   EXPECT_EQ(kView2ID, event_list[0].view_id);
 }
 
 TEST_F(FocusManagerTest, FocusChangeListener) {
   View* view1 = new View();
-  view1->SetFocusable(true);
+  view1->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   View* view2 = new View();
-  view2->SetFocusable(true);
+  view2->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   GetContentsView()->AddChildView(view1);
   GetContentsView()->AddChildView(view2);
 
   TestFocusChangeListener listener;
   AddFocusChangeListener(&listener);
 
   // Required for VS2010: http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair
   views::View* null_view = NULL;
 
   view1->RequestFocus();
@@ skipping 484 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FocusInAboutToRequestFocusFromTabTraversalView);
 };
 }  // namespace
 
 // Verifies a focus change done during a call to
 // AboutToRequestFocusFromTabTraversal() is honored.
 TEST_F(FocusManagerTest, FocusInAboutToRequestFocusFromTabTraversal) {
   // Create 3 views focuses the 3 and advances to the second. The 2nd views
   // implementation of AboutToRequestFocusFromTabTraversal() focuses the first.
   views::View* v1 = new View;
-  v1->SetFocusable(true);
+  v1->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   GetContentsView()->AddChildView(v1);
 
   FocusInAboutToRequestFocusFromTabTraversalView* v2 =
       new FocusInAboutToRequestFocusFromTabTraversalView;
-  v2->SetFocusable(true);
+  v2->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   v2->set_view_to_focus(v1);
   GetContentsView()->AddChildView(v2);
 
   views::View* v3 = new View;
-  v3->SetFocusable(true);
+  v3->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   GetContentsView()->AddChildView(v3);
 
   v3->RequestFocus();
   GetWidget()->GetFocusManager()->AdvanceFocus(true);
   EXPECT_TRUE(v1->HasFocus());
 }
 
 TEST_F(FocusManagerTest, RotatePaneFocus) {
   views::AccessiblePaneView* pane1 = new AccessiblePaneView();
   GetContentsView()->AddChildView(pane1);
 
   views::View* v1 = new View;
-  v1->SetFocusable(true);
+  v1->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   pane1->AddChildView(v1);
 
   views::View* v2 = new View;
-  v2->SetFocusable(true);
+  v2->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   pane1->AddChildView(v2);
 
   views::AccessiblePaneView* pane2 = new AccessiblePaneView();
   GetContentsView()->AddChildView(pane2);
 
   views::View* v3 = new View;
-  v3->SetFocusable(true);
+  v3->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   pane2->AddChildView(v3);
 
   views::View* v4 = new View;
-  v4->SetFocusable(true);
+  v4->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   pane2->AddChildView(v4);
 
   std::vector<views::View*> panes;
   panes.push_back(pane1);
   panes.push_back(pane2);
   SetAccessiblePanes(panes);
 
   FocusManager* focus_manager = GetWidget()->GetFocusManager();
 
   // Advance forwards. Focus should stay trapped within each pane.
@@ skipping 34 matching lines @@
   EXPECT_EQ(v3, focus_manager->GetFocusedView());
 
   EXPECT_FALSE(focus_manager->RotatePaneFocus(
       FocusManager::kForward, FocusManager::kNoWrap));
   EXPECT_EQ(v3, focus_manager->GetFocusedView());
 }
 
 // Verifies the stored focus view tracks the focused view.
 TEST_F(FocusManagerTest, ImplicitlyStoresFocus) {
   views::View* v1 = new View;
-  v1->SetFocusable(true);
+  v1->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   GetContentsView()->AddChildView(v1);
 
   views::View* v2 = new View;
-  v2->SetFocusable(true);
+  v2->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   GetContentsView()->AddChildView(v2);
 
   // Verify a focus request on |v1| implicitly updates the stored focus view.
   v1->RequestFocus();
   EXPECT_TRUE(v1->HasFocus());
   EXPECT_EQ(v1, GetWidget()->GetFocusManager()->GetStoredFocusView());
 
   // Verify a focus request on |v2| implicitly updates the stored focus view.
   v2->RequestFocus();
   EXPECT_TRUE(v2->HasFocus());
@@ skipping 33 matching lines @@
 TEST_F(FocusManagerArrowKeyTraversalTest, ArrowKeyTraversal) {
   FocusManager* focus_manager = GetFocusManager();
   const ui::KeyEvent left_key(ui::ET_KEY_PRESSED, ui::VKEY_LEFT, ui::EF_NONE);
   const ui::KeyEvent right_key(ui::ET_KEY_PRESSED, ui::VKEY_RIGHT, ui::EF_NONE);
   const ui::KeyEvent up_key(ui::ET_KEY_PRESSED, ui::VKEY_UP, ui::EF_NONE);
   const ui::KeyEvent down_key(ui::ET_KEY_PRESSED, ui::VKEY_DOWN, ui::EF_NONE);
 
   std::vector<views::View*> v;
   for (size_t i = 0; i < 2; ++i) {
     views::View* view = new View;
-    view->SetFocusable(true);
+    view->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
     GetContentsView()->AddChildView(view);
     v.push_back(view);
   }
 
   // Arrow key traversal is off and arrow key does not change focus.
   FocusManager::set_arrow_key_traversal_enabled(false);
   v[0]->RequestFocus();
   focus_manager->OnKeyEvent(right_key);
   EXPECT_EQ(v[0], focus_manager->GetFocusedView());
   focus_manager->OnKeyEvent(left_key);
@@ skipping 10 matching lines @@
   EXPECT_EQ(v[1], focus_manager->GetFocusedView());
   focus_manager->OnKeyEvent(left_key);
   EXPECT_EQ(v[0], focus_manager->GetFocusedView());
   focus_manager->OnKeyEvent(down_key);
   EXPECT_EQ(v[1], focus_manager->GetFocusedView());
   focus_manager->OnKeyEvent(up_key);
   EXPECT_EQ(v[0], focus_manager->GetFocusedView());
 }
 
 TEST_F(FocusManagerTest, StoreFocusedView) {
-  View view;
-  GetFocusManager()->SetFocusedView(&view);
+  View* view = new View;
+  // Add view to the view hierarchy and make it focusable.
+  GetWidget()->GetRootView()->AddChildView(view);
+  view->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
+
+  GetFocusManager()->SetFocusedView(view);
   GetFocusManager()->StoreFocusedView(false);
   EXPECT_EQ(NULL, GetFocusManager()->GetFocusedView());
   EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
-  EXPECT_EQ(&view, GetFocusManager()->GetStoredFocusView());
+  EXPECT_EQ(view, GetFocusManager()->GetStoredFocusView());
 
   // Repeat with |true|.
-  GetFocusManager()->SetFocusedView(&view);
+  GetFocusManager()->SetFocusedView(view);
   GetFocusManager()->StoreFocusedView(true);
   EXPECT_EQ(NULL, GetFocusManager()->GetFocusedView());
   EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
-  EXPECT_EQ(&view, GetFocusManager()->GetStoredFocusView());
+  EXPECT_EQ(view, GetFocusManager()->GetStoredFocusView());
 }
 
+#if defined(OS_MACOSX)
+// Test that the correct view is restored if full keyboard access is changed.
+TEST_F(FocusManagerTest, StoreFocusedViewFullKeyboardAccess) {
+  View* view1 = new View;
+  View* view2 = new View;
+  View* view3 = new View;
+
+  // Make view1 focusable in accessibility mode, view2 not focusable and view3
+  // always focusable.
+  view1->SetFocusBehavior(views::View::FocusBehavior::ACCESSIBLE_ONLY);
+  view2->SetFocusBehavior(views::View::FocusBehavior::NEVER);
+  view3->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
+
+  // Add views to the view hierarchy
+  GetWidget()->GetRootView()->AddChildView(view1);
+  GetWidget()->GetRootView()->AddChildView(view2);
+  GetWidget()->GetRootView()->AddChildView(view3);
+
+  view1->RequestFocus();
+  EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
+  GetFocusManager()->StoreFocusedView(true);
+  EXPECT_EQ(nullptr, GetFocusManager()->GetFocusedView());
+
+  // Turn off full keyboard access mode and restore focused view. Since view1 is
+  // no longer focusable, view3 should have focus.
+  GetFocusManager()->SetKeyboardAccessible(false);
+  EXPECT_FALSE(GetFocusManager()->RestoreFocusedView());
+  EXPECT_EQ(view3, GetFocusManager()->GetFocusedView());
+
+  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());
+}
+#endif
+
 namespace {
 
 // Trivial WidgetDelegate implementation that allows setting return value of
 // ShouldAdvanceFocusToTopLevelWidget().
 class AdvanceFocusWidgetDelegate : public WidgetDelegate {
  public:
   explicit AdvanceFocusWidgetDelegate(Widget* widget)
       : widget_(widget),
         should_advance_focus_to_parent_(false) {}
   ~AdvanceFocusWidgetDelegate() override {}
@@ skipping 15 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AdvanceFocusWidgetDelegate);
 };
 
 }  // namespace
 
 // Verifies focus wrapping happens in the same widget.
 TEST_F(FocusManagerTest, AdvanceFocusStaysInWidget) {
   // Add |widget_view| as a child of the Widget.
   View* widget_view = new View;
-  widget_view->SetFocusable(true);
+  widget_view->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   widget_view->SetBounds(20, 0, 20, 20);
   GetContentsView()->AddChildView(widget_view);
 
   // Create a widget with two views, focus the second.
   std::unique_ptr<AdvanceFocusWidgetDelegate> delegate;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.child = true;
   params.bounds = gfx::Rect(10, 10, 100, 100);
   params.parent = GetWidget()->GetNativeView();
   Widget child_widget;
   delegate.reset(new AdvanceFocusWidgetDelegate(&child_widget));
   params.delegate = delegate.get();
   child_widget.Init(params);
   View* view1 = new View;
-  view1->SetFocusable(true);
+  view1->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   view1->SetBounds(0, 0, 20, 20);
   View* view2 = new View;
-  view2->SetFocusable(true);
+  view2->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   view2->SetBounds(20, 0, 20, 20);
   child_widget.client_view()->AddChildView(view1);
   child_widget.client_view()->AddChildView(view2);
   child_widget.Show();
   view2->RequestFocus();
   EXPECT_EQ(view2, GetFocusManager()->GetFocusedView());
 
   // Advance focus backwards, which should focus the first.
   GetFocusManager()->AdvanceFocus(false);
   EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
 
   // Focus forward to |view2|.
   GetFocusManager()->AdvanceFocus(true);
   EXPECT_EQ(view2, GetFocusManager()->GetFocusedView());
 
   // And forward again, wrapping back to |view1|.
   GetFocusManager()->AdvanceFocus(true);
   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