Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/widget/native_widget_private.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_
 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_
 
 #include "base/strings/string16.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 43 matching lines @@
   static NativeWidgetPrivate* GetNativeWidgetForNativeView(
       gfx::NativeView native_view);
   static NativeWidgetPrivate* GetNativeWidgetForNativeWindow(
       gfx::NativeWindow native_window);
 
   // Retrieves the top NativeWidgetPrivate in the hierarchy containing the given
   // NativeView, or NULL if there is no NativeWidgetPrivate that contains it.
   static NativeWidgetPrivate* GetTopLevelNativeWidget(
       gfx::NativeView native_view);
 
-  static void GetAllChildWidgets(gfx::NativeView native_view,
-                                 Widget::Widgets* children);
-  static void GetAllOwnedWidgets(gfx::NativeView native_view,
-                                 Widget::Widgets* owned);
+  static void GetAllChildAndOwnedWidgets(gfx::NativeView native_view,
+                                         Widget::Widgets* widgets);
   static void ReparentNativeView(gfx::NativeView native_view,
                                  gfx::NativeView new_parent);
 
   // Returns true if any mouse button is currently down.
   static bool IsMouseButtonDown();
 
   static gfx::FontList GetWindowTitleFontList();
 
   // Initializes the NativeWidget.
   virtual void InitNativeWidget(const Widget::InitParams& params) = 0;
@@ skipping 153 matching lines @@
   virtual void RepostNativeEvent(gfx::NativeEvent native_event) = 0;
 
   // Overridden from NativeWidget:
   virtual internal::NativeWidgetPrivate* AsNativeWidgetPrivate() override;
 };
 
 }  // namespace internal
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_