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 1085 matching lines @@
   }
 
   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);
   }
 }
 
 // static
 void NativeWidgetPrivate::GetAllOwnedWidgets(gfx::NativeView native_view,

[tapted, 2014/10/15 23:59:24]

you'll need to update the comment in widget.h

https://code.google.com/p/chromium/codesearch#chromium/src/ui/views/widget/wi...

[sashab, 2014/10/20 03:03:00]

Done to just remove 'non-child'. Didn't think I needed to be explicit about
including children.

                                              Widget::Widgets* owned) {
+  // Add all owned widgets.
   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);
   }
+
+  // Add all owned windows.

[tapted, 2014/10/15 23:59:24]

owned windows -> child windows

[sashab, 2014/10/20 03:03:00]

Done.

+  const aura::Window::Windows& child_windows = native_view->children();
+  for (aura::Window::Windows::const_iterator i = child_windows.begin();

[tapted, 2014/10/15 23:59:24]

might as well start using C++11. Pretty sure this becomes just

for (const auto& child : native_view->children())
  GetAllChildWidgets(child, owned);

the other loop in this function should be updated too

[sashab, 2014/10/20 03:03:00]

Done. Git cl format wants to change "x->y()" to "x -> y()" but I prevented it...
Looking for a place to file bugs on clang-format.

+       i != child_windows.end();
+       ++i) {
+    GetAllChildWidgets((*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;
@@ skipping 47 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