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>
+#import <objc/runtime.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"
+#include "ui/views/widget/widget_mac_utils.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) {
+// |host| widget.
+void ReparentNSView(NSView* native_view, NativeViewHost* host) {
   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) {
+  if (!host) {
     [native_view removeFromSuperview];
     return;
   }
-
-  BridgedContentView* new_superview =
-      base::mac::ObjCCastStrict<BridgedContentView>(
-          new_parent->GetNativeView());
-  DCHECK(new_superview);
-  [new_superview addSubview:native_view];
+  AttachNSViewRelatedToHost(native_view, host);
 }
 
 }  // 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());
+  ReparentNSView(host_->native_view(), host_);
+  objc_setAssociatedObject(native_view_.get(), &kAssociatedViewHostKey,
+                           [NSValue valueWithPointer:host_],
+                           OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 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);
+  ReparentNSView(host_->native_view(), nullptr);
+  objc_setAssociatedObject(native_view_.get(), &kAssociatedViewHostKey, nil,
+                           OBJC_ASSOCIATION_RETAIN_NONATOMIC);
   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