views: Restore to old behaviour of Widget::ReparentNativeView().

ui/views/widget/native_widget_aura.cc

 // 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.
 
 #include "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 1127 matching lines @@
   Widget::Widgets widgets;
   GetAllChildWidgets(native_view, &widgets);
 
   // First notify all the widgets that they are being disassociated
   // from their previous parent.
   for (Widget::Widgets::iterator it = widgets.begin();
       it != widgets.end(); ++it) {
     (*it)->NotifyNativeViewHierarchyWillChange();
   }
 
-  if (new_parent)
+  if (new_parent) {
     new_parent->AddChild(native_view);
-  else if (previous_parent)
-    previous_parent->RemoveChild(native_view);
+  } else {
+    // The following looks weird, but it's the equivalent of what aura has
+    // always done. (The previous behaviour of aura::Window::SetParent() used
+    // NULL as a special value that meant ask the WindowTreeClient where things
+    // should go.)
+    //
+    // This probably isn't strictly correct, but its an invariant that a Window
+    // in use will be attached to a RootWindow, so we can't just call
+    // RemoveChild here. The only possible thing that could assign a RootWindow
+    // in this case is the stacking client of the current RootWindow. This
+    // matches our previous behaviour; the global stacking client would almost
+    // always reattach the window to the same RootWindow.
+    aura::Window* root_window = native_view->GetRootWindow();
+    aura::client::ParentWindowWithContext(
+        native_view, root_window, root_window->GetBoundsInScreen());
+  }
 
   // And now, notify them that they have a brand new parent.
   for (Widget::Widgets::iterator it = widgets.begin();
       it != widgets.end(); ++it) {
     (*it)->NotifyNativeViewHierarchyChanged();
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
@@ skipping 18 matching lines @@
     gfx::NativeView native_view) {
   aura::client::CaptureClient* capture_client =
       aura::client::GetCaptureClient(native_view->GetRootWindow());
   if (!capture_client)
     return nullptr;
   return capture_client->GetGlobalCaptureWindow();
 }
 
 }  // namespace internal
 }  // namespace views