MacViews/a11y: Allow accessibility clients to focus and unfocus focusable Views.

ui/views/accessibility/native_view_accessibility_unittest.cc

Index: ui/views/accessibility/native_view_accessibility_unittest.cc
diff --git a/ui/views/accessibility/native_view_accessibility_unittest.cc b/ui/views/accessibility/native_view_accessibility_unittest.cc
index 88d9216815e2b48e063cd7e1cc4ca4b1a8dfc340..4fd1b1e545b6b833381cbc3f80993f2329890cac 100644
--- a/ui/views/accessibility/native_view_accessibility_unittest.cc
+++ b/ui/views/accessibility/native_view_accessibility_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ -34,7 +35,7 @@ class NativeViewAccessibilityTest : public ViewsTestBase {
 
     widget_ = new views::Widget;
     views::Widget::InitParams params =
-        CreateParams(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+        CreateParams(views::Widget::InitParams::TYPE_WINDOW);
     params.bounds = gfx::Rect(0, 0, 200, 200);
     widget_->Init(params);
 
@@ -46,7 +47,7 @@ class NativeViewAccessibilityTest : public ViewsTestBase {
     button_->AddChildView(label_);
     label_accessibility_ = NativeViewAccessibility::Create(label_);
 
-    widget_->SetContentsView(button_);
+    widget_->GetContentsView()->AddChildView(button_);
   }
 
   void TearDown() override {
@@ -87,6 +88,21 @@ TEST_F(NativeViewAccessibilityTest, LabelIsChildOfButton) {
             label_accessibility_->GetParent());
 }
 
+TEST_F(NativeViewAccessibilityTest, WritableFocus) {
+  widget_->Show();
+  // Make |button_| focusable, and focus/unfocus it via NativeViewAccessibility.
+  button_->SetFocusBehavior(View::FocusBehavior::ALWAYS);
+  EXPECT_EQ(nullptr, button_->GetFocusManager()->GetFocusedView());
+  EXPECT_EQ(nullptr, button_accessibility_->GetFocus());
+  EXPECT_TRUE(button_accessibility_->SetFocused(true));
+  EXPECT_EQ(button_, button_->GetFocusManager()->GetFocusedView());
+  EXPECT_EQ(button_->GetNativeViewAccessible(),
+            button_accessibility_->GetFocus());
+  EXPECT_TRUE(button_accessibility_->SetFocused(false));
+  EXPECT_EQ(nullptr, button_->GetFocusManager()->GetFocusedView());
+  EXPECT_EQ(nullptr, button_accessibility_->GetFocus());
+}
+
 // Subclass of NativeViewAccessibility that destroys itself when its
 // parent widget is destroyed, for the purposes of making sure this
 // doesn't lead to a crash.