Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/widget/widget.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_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 295 matching lines @@
   static Widget* GetWidgetForNativeView(gfx::NativeView native_view);
   static Widget* GetWidgetForNativeWindow(gfx::NativeWindow native_window);
 
   // Retrieves the top level widget in a native view hierarchy
   // starting at |native_view|. Top level widget is a widget with TYPE_WINDOW,
   // TYPE_PANEL, TYPE_WINDOW_FRAMELESS, POPUP or MENU and has its own
   // focus manager. This may be itself if the |native_view| is top level,
   // 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.
   static void ReparentNativeView(gfx::NativeView native_view,
                                  gfx::NativeView new_parent);
 
   // Returns the preferred size of the contents view of this window based on
   // its localized size data. The width in cols is held in a localized string
   // resource identified by |col_resource_id|, the height in the same fashion.
   // TODO(beng): This should eventually live somewhere else, probably closer to
@@ skipping 611 matching lines @@
   bool movement_disabled_;
 
   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_