Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/controls/native/native_view_host_mac.mm

 // Copyright 2014 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/controls/native/native_view_host_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 namespace {
 
 // Reparents |native_view| to be a child of the native content view of
 // |new_parent|.
 void ReparentNSView(NSView* native_view, Widget* new_parent) {
   DCHECK(native_view);
   // Mac's NativeViewHost has no support for hosting its own child widgets.
   // This check is probably overly restrictive, since the Widget containing the
   // NativeViewHost _is_ allowed child Widgets. However, we don't know yet
   // whether those child Widgets need to be distinguished from Widgets that code
   // might want to associate with the hosted NSView instead.
   {
     Widget::Widgets child_widgets;
-    Widget::GetAllChildWidgets(native_view, &child_widgets);
+    Widget::GetAllChildAndOwnedWidgets(native_view, &child_widgets);
     CHECK_GE(1u, child_widgets.size());  // 1 (itself) or 0 if detached.
   }
 
   if (!new_parent) {
     [native_view removeFromSuperview];
     return;
   }
 
   BridgedContentView* new_superview =
       base::mac::ObjCCastStrict<BridgedContentView>(
@@ skipping 93 matching lines @@
   return gfx::kNullCursor;
 }
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostMac(host);
 }
 
 }  // namespace views