1 files changed, 20 insertions, 5 deletions
diff --git a/chromium/ui/views/accessibility/view_accessibility.cc b/chromium/ui/views/accessibility/view_accessibility.cc
index 4ff677b664e..5dfb136d2d1 100644
--- a/chromium/ui/views/accessibility/view_accessibility.cc
+++ b/chromium/ui/views/accessibility/view_accessibility.cc
@@ -121,6 +121,10 @@ const ui::AXUniqueId& ViewAccessibility::GetUniqueId() const {
   return unique_id_;
 }
 
+bool ViewAccessibility::IsLeaf() const {
+  return is_leaf_;
+}
+
 void ViewAccessibility::GetAccessibleNodeData(ui::AXNodeData* data) const {
   data->id = GetUniqueId().Get();
 
@@ -206,7 +210,7 @@ void ViewAccessibility::GetAccessibleNodeData(ui::AXNodeData* data) const {
     return;
   }
 
-  if (view_->IsAccessibilityFocusable())
+  if (view_->IsAccessibilityFocusable() && !focused_virtual_child_)
     data->AddState(ax::mojom::State::kFocusable);
 
   if (!view_->GetEnabled())
@@ -224,13 +228,24 @@ void ViewAccessibility::OverrideFocus(AXVirtualView* virtual_view) {
       << "|virtual_view| must be nullptr or a descendant of this view.";
   focused_virtual_child_ = virtual_view;
 
-  if (focused_virtual_child_) {
-    focused_virtual_child_->NotifyAccessibilityEvent(ax::mojom::Event::kFocus);
-  } else {
-    view_->NotifyAccessibilityEvent(ax::mojom::Event::kFocus, true);
+  if (view_->HasFocus()) {
+    if (focused_virtual_child_) {
+      focused_virtual_child_->NotifyAccessibilityEvent(
+          ax::mojom::Event::kFocus);
+    } else {
+      view_->NotifyAccessibilityEvent(ax::mojom::Event::kFocus, true);
+    }
   }
 }
 
+void ViewAccessibility::SetPopupFocusOverride() {}
+
+void ViewAccessibility::EndPopupFocusOverride() {}
+
+bool ViewAccessibility::IsFocusedForTesting() {
+  return view_->HasFocus() && !focused_virtual_child_;
+}
+
 void ViewAccessibility::OverrideRole(const ax::mojom::Role role) {
   DCHECK(IsValidRoleForViews(role)) << "Invalid role for Views.";
   custom_data_.role = role;