Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/accessibility/native_view_accessibility_win.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/accessibility/native_view_accessibility_win.h"
 
 #include <oleacc.h>
 #include <UIAutomationClient.h>
 
 #include <set>
@@ skipping 1473 matching lines @@
       text, line_breaks, boundary, start_offset, direction);
 }
 
 void NativeViewAccessibilityWin::PopulateChildWidgetVector(
     std::vector<Widget*>* result_child_widgets) {
   const Widget* widget = view()->GetWidget();
   if (!widget)
     return;
 
   std::set<Widget*> child_widgets;
-  Widget::GetAllChildWidgets(widget->GetNativeView(), &child_widgets);
   Widget::GetAllOwnedWidgets(widget->GetNativeView(), &child_widgets);
   for (std::set<Widget*>::const_iterator iter = child_widgets.begin();
            iter != child_widgets.end(); ++iter) {
     Widget* child_widget = *iter;
-    if (child_widget == widget)
-      continue;
+    DCHECK_NE(widget, child_widget);
 
     if (!child_widget->IsVisible())
       continue;
 
     if (widget->GetNativeWindowProperty(kWidgetNativeViewHostKey))
       continue;
 
     result_child_widgets->push_back(child_widget);
   }
 }
@@ skipping 20 matching lines @@
     if (view == NULL || view == view_) {
       alert_target_view_storage_ids_.erase(
           alert_target_view_storage_ids_.begin() + i);
     } else {
       ++i;
     }
   }
 }
 
 }  // namespace views