Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/widget/native_widget_aura.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/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 1069 matching lines @@
   while (window) {
     NativeWidgetPrivate* native_widget = GetNativeWidgetForNativeView(window);
     if (native_widget)
       top_level_native_widget = native_widget;
     window = window->parent();
   }
   return top_level_native_widget;
 }
 
 // static
-void NativeWidgetPrivate::GetAllChildWidgets(gfx::NativeView native_view,
-                                             Widget::Widgets* children) {
+void NativeWidgetPrivate::GetAllChildAndOwnedWidgets(
+    gfx::NativeView native_view,
+    Widget::Widgets* widgets) {
   {
-    // Code expects widget for |native_view| to be added to |children|.
+    // Code expects widget for |native_view| to be added to |widgets|.
     NativeWidgetPrivate* native_widget = static_cast<NativeWidgetPrivate*>(
         GetNativeWidgetForNativeView(native_view));
     if (native_widget && native_widget->GetWidget())
-      children->insert(native_widget->GetWidget());
+      widgets->insert(native_widget->GetWidget());
   }
 
-  const aura::Window::Windows& child_windows = native_view->children();
-  for (aura::Window::Windows::const_iterator i = child_windows.begin();
-       i != child_windows.end(); ++i) {
-    GetAllChildWidgets((*i), children);
+  // Add all owned widgets.
+  for (aura::Window* transient_child : wm::GetTransientChildren(native_view)) {
+    NativeWidgetPrivate* native_widget = static_cast<NativeWidgetPrivate*>(
+        GetNativeWidgetForNativeView(transient_child));
+    if (native_widget && native_widget->GetWidget())
+      widgets->insert(native_widget->GetWidget());
+    GetAllChildAndOwnedWidgets(transient_child, widgets);
   }
+
+  // Add all child windows.
+  for (aura::Window* child : native_view->children())
+    GetAllChildAndOwnedWidgets(child, widgets);
 }
 
 // static
-void NativeWidgetPrivate::GetAllOwnedWidgets(gfx::NativeView native_view,
-                                             Widget::Widgets* owned) {
-  const aura::Window::Windows& transient_children =
-      wm::GetTransientChildren(native_view);
-  for (aura::Window::Windows::const_iterator i = transient_children.begin();
-       i != transient_children.end(); ++i) {
-    NativeWidgetPrivate* native_widget = static_cast<NativeWidgetPrivate*>(
-        GetNativeWidgetForNativeView(*i));
-    if (native_widget && native_widget->GetWidget())
-      owned->insert(native_widget->GetWidget());
-    GetAllOwnedWidgets((*i), owned);
-  }
-}
-
-// static
 void NativeWidgetPrivate::ReparentNativeView(gfx::NativeView native_view,
                                              gfx::NativeView new_parent) {
   DCHECK(native_view != new_parent);
 
   gfx::NativeView previous_parent = native_view->parent();
   if (previous_parent == new_parent)
     return;
 
   Widget::Widgets widgets;
-  GetAllChildWidgets(native_view, &widgets);
+  GetAllChildAndOwnedWidgets(native_view, &widgets);
 
   // First notify all the widgets that they are being disassociated
   // from their previous parent.
   for (Widget::Widgets::iterator it = widgets.begin();
       it != widgets.end(); ++it) {
     (*it)->NotifyNativeViewHierarchyWillChange();
   }
 
   if (new_parent) {
     new_parent->AddChild(native_view);
@@ skipping 34 matching lines @@
   l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
   return gfx::FontList(gfx::Font(caption_font));
 #else
   return gfx::FontList();
 #endif
 }
 
 }  // namespace internal
 }  // namespace views