Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/widget/widget.h

Index: ui/views/widget/widget.h
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 08ab9398eb591245cc288d4a01998f31e11344c9..376a2175878052dc270efdec05f9a80ccf51ed51 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -313,14 +313,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   // or NULL if there is no toplevel in a native view hierarchy.
   static Widget* GetTopLevelWidgetForNativeView(gfx::NativeView native_view);
 
-  // Returns all Widgets in |native_view|'s hierarchy, including itself if
-  // it is one.
-  static void GetAllChildWidgets(gfx::NativeView native_view,
-                                 Widgets* children);
-
-  // Returns all non-child Widgets owned by |native_view|.
-  static void GetAllOwnedWidgets(gfx::NativeView native_view,
-                                 Widgets* owned);
+  // Returns all owned and child Widgets in |native_view|'s hierarchy, including
+  // itself if it is one.
+  static void GetAllChildAndOwnedWidgets(gfx::NativeView native_view,
+                                         Widgets* widgets);
 
   // Re-parent a NativeView and notify all Widgets in |native_view|'s hierarchy
   // of the change.