Remove owned views from AXAuraObjCache when widget is deleted.

ui/views/accessibility/ax_aura_obj_cache.cc

 // Copyright 2014 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/accessibility/ax_aura_obj_cache.h"
 
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
@@ skipping 31 matching lines @@
 }
 
 int32 AXAuraObjCache::GetID(aura::Window* window) {
   return GetIDInternal(window, window_to_id_map_);
 }
 
 void AXAuraObjCache::Remove(View* view) {
   RemoveInternal(view, view_to_id_map_);
 }
 
+void AXAuraObjCache::RemoveViewSubtree(View* view) {
+  Remove(view);
+  for (int i = 0; i < view->child_count(); ++i)
+    RemoveViewSubtree(view->child_at(i));
+}
+
 void AXAuraObjCache::Remove(Widget* widget) {
   RemoveInternal(widget, widget_to_id_map_);
+
+  // When an entire widget is deleted, it doesn't always send a notification
+  // on each of its views, so we need to explore them recursively.
+  if (widget->GetRootView())
+    RemoveViewSubtree(widget->GetRootView());
 }
 
 void AXAuraObjCache::Remove(aura::Window* window) {
   RemoveInternal(window, window_to_id_map_);
 }
 
 AXAuraObjWrapper* AXAuraObjCache::Get(int32 id) {
   std::map<int32, AXAuraObjWrapper*>::iterator it = cache_.find(id);
 
   if (it == cache_.end())
@@ skipping 67 matching lines @@
 void AXAuraObjCache::RemoveInternal(
     AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) {
   int32 id = GetID(aura_view);
   if (id == -1)
     return;
   aura_view_to_id_map.erase(aura_view);
   Remove(id);
 }
 
 }  // namespace views