Implement NativeWidgetMac::ReorderNativeViews

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"
+#import "ui/views/cocoa/bridged_native_widget.h"
 #include "ui/views/controls/native/native_view_host.h"
+#include "ui/views/widget/native_widget_mac.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) {
+void EnsureNativeViewHasNoChildWidgets(NSView* native_view) {
   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);
     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>(
-          new_parent->GetNativeView());
-  DCHECK(new_superview);
-  [new_superview addSubview:native_view];
 }
 
 }  // namespace
 
 NativeViewHostMac::NativeViewHostMac(NativeViewHost* host) : host_(host) {
 }
 
 NativeViewHostMac::~NativeViewHostMac() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostMac, NativeViewHostWrapper implementation:
 
 void NativeViewHostMac::AttachNativeView() {
   DCHECK(host_->native_view());
   DCHECK(!native_view_);
   native_view_.reset([host_->native_view() retain]);
-  ReparentNSView(host_->native_view(), host_->GetWidget());
+
+  EnsureNativeViewHasNoChildWidgets(native_view_.get());

[tapted, 2016/03/17 23:04:15]

nit: .get() shouldn't be required

+  [host_->GetWidget()->GetNativeView() addSubview:native_view_.get()];

[tapted, 2016/03/17 23:04:15]

Yep - I like this change. But can you move this below the DCHECK(bridge) and do

[bridge->ns_view() addSubview:native_view];

(the .get() shouldn't be required)

+  BridgedNativeWidget* bridge = NativeWidgetMac::GetBridgeForNativeWindow(
+      host_->GetWidget()->GetNativeWindow());
+  DCHECK(bridge);
+  bridge->SetAssociationForView(host_, native_view_.get());

[tapted, 2016/03/17 23:04:15]

nit: no .get()

 }
 
 void NativeViewHostMac::NativeViewDetaching(bool destroyed) {
   // |destroyed| is only true if this class calls host_->NativeViewDestroyed().
   // Aura does this after observing an aura OnWindowDestroying, but NSViews
   // are reference counted so there isn't a reliable signal. Instead, a
   // reference is retained until the NativeViewHost is detached.
   DCHECK(!destroyed);
   // |native_view_| can be nil here if RemovedFromWidget() is called before
   // NativeViewHost::Detach().
   DCHECK(!native_view_ || native_view_ == host_->native_view());
   [host_->native_view() setHidden:YES];
-  ReparentNSView(host_->native_view(), NULL);
+  [host_->native_view() removeFromSuperview];
+
+  EnsureNativeViewHasNoChildWidgets(host_->native_view());
+  BridgedNativeWidget* bridge = NativeWidgetMac::GetBridgeForNativeWindow(
+      host_->GetWidget()->GetNativeWindow());
+  // BridgedNativeWidget can be null when Widget is closing.
+  if (bridge) {

[tapted, 2016/03/17 23:04:15]

nit: curlies not required

+    bridge->ClearAssociationForView(host_);
+  }
+
   native_view_.reset();
 }
 
 void NativeViewHostMac::AddedToWidget() {
   if (!host_->native_view())
     return;
 
   AttachNativeView();
   host_->Layout();
 }
@@ skipping 65 matching lines @@
   return gfx::kNullCursor;
 }
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostMac(host);
 }
 
 }  // namespace views