Fix Chrome OS virtual keyboard accessibility

ui/views/accessibility/ax_window_obj_wrapper.cc

Index: ui/views/accessibility/ax_window_obj_wrapper.cc
diff --git a/ui/views/accessibility/ax_window_obj_wrapper.cc b/ui/views/accessibility/ax_window_obj_wrapper.cc
index 4352db0109aaa9b011135308023987aed1fe1b2f..0f08a3c8434892d11c5071a577d14714744b795b 100644
--- a/ui/views/accessibility/ax_window_obj_wrapper.cc
+++ b/ui/views/accessibility/ax_window_obj_wrapper.cc
@@ -54,12 +54,24 @@ void AXWindowObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
   out_node_data->AddStringAttribute(ui::AX_ATTR_NAME,
                                     base::UTF16ToUTF8(window_->GetTitle()));
   out_node_data->state = 0;
-  out_node_data->location = gfx::RectF(window_->bounds());
+  out_node_data->location = gfx::RectF(window_->GetBoundsInScreen());
 
   ui::AXTreeIDRegistry::AXTreeID child_ax_tree_id =
       window_->GetProperty(ui::kChildAXTreeID);
-  if (child_ax_tree_id != ui::AXTreeIDRegistry::kNoAXTreeID)
+  if (child_ax_tree_id != ui::AXTreeIDRegistry::kNoAXTreeID) {
+    // Most often, child AX trees are parented to Views. We need to handle
+    // the case where they're not here, but we don't want the same AX tree
+    // to be a child of two different parents.
+    //
+    // To avoid this double-parenting, only add the child tree ID of this
+    // window if the top-level window doesn't have an associated Widget.
+    if (!window_->GetToplevelWindow() ||
+        Widget::GetWidgetForNativeView(window_->GetToplevelWindow())) {
+      return;
+    }
+
     out_node_data->AddIntAttribute(ui::AX_ATTR_CHILD_TREE_ID, child_ax_tree_id);
+  }
 }
 
 int32_t AXWindowObjWrapper::GetID() {
@@ -85,6 +97,11 @@ void AXWindowObjWrapper::OnWindowHierarchyChanged(
 void AXWindowObjWrapper::OnWindowBoundsChanged(aura::Window* window,
                                                const gfx::Rect& old_bounds,
                                                const gfx::Rect& new_bounds) {
+  if (window != window_)
+    return;
+
+  AXAuraObjCache::GetInstance()->FireEvent(this, ui::AX_EVENT_LOCATION_CHANGED);
+
   Widget* widget = Widget::GetWidgetForNativeView(window);
   if (widget) {
     widget->GetRootView()->NotifyAccessibilityEvent(
@@ -92,4 +109,13 @@ void AXWindowObjWrapper::OnWindowBoundsChanged(aura::Window* window,
   }
 }
 
+void AXWindowObjWrapper::OnWindowPropertyChanged(aura::Window* window,
+                                                 const void* key,
+                                                 intptr_t old) {
+  if (window == window_ && key == ui::kChildAXTreeID) {
+    AXAuraObjCache::GetInstance()->FireEvent(this,
+                                             ui::AX_EVENT_CHILDREN_CHANGED);
+  }
+}
+
 }  // namespace views