views/mus: Set-up transient windows correctly.

components/mus/ws/default_access_policy.cc

 // 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 "components/mus/ws/default_access_policy.h"
 
 #include "components/mus/ws/access_policy_delegate.h"
 #include "components/mus/ws/server_window.h"
 
 namespace mus {
@@ skipping 19 matching lines @@
                                        const ServerWindow* child) const {
   return WasCreatedByThisConnection(child) &&
          (delegate_->HasRootForAccessPolicy(parent) ||
           (WasCreatedByThisConnection(parent) &&
            !delegate_->IsWindowRootOfAnotherConnectionForAccessPolicy(parent)));
 }
 
 bool DefaultAccessPolicy::CanAddTransientWindow(
     const ServerWindow* parent,
     const ServerWindow* child) const {
-  return WasCreatedByThisConnection(child) &&
+  return (delegate_->HasRootForAccessPolicy(child) ||
+          WasCreatedByThisConnection(child)) &&
          (delegate_->HasRootForAccessPolicy(parent) ||
           WasCreatedByThisConnection(parent));
 }
 
 bool DefaultAccessPolicy::CanRemoveTransientWindowFromParent(
     const ServerWindow* window) const {
-  if (!WasCreatedByThisConnection(window))
-    return false;  // Can only unparent windows we created.
-
-  return delegate_->HasRootForAccessPolicy(window->transient_parent()) ||
-         WasCreatedByThisConnection(window->transient_parent());
+  return (delegate_->HasRootForAccessPolicy(window) ||
+          WasCreatedByThisConnection(window)) &&
+         (delegate_->HasRootForAccessPolicy(window->transient_parent()) ||
+          WasCreatedByThisConnection(window->transient_parent()));
 }
 
 bool DefaultAccessPolicy::CanReorderWindow(
     const ServerWindow* window,
     const ServerWindow* relative_window,
     mojom::OrderDirection direction) const {
   return WasCreatedByThisConnection(window) &&
          WasCreatedByThisConnection(relative_window);
 }
 
@@ skipping 119 matching lines @@
 }
 
 bool DefaultAccessPolicy::IsDescendantOfEmbedRoot(
     const ServerWindow* window) const {
   return delegate_->IsDescendantOfEmbedRoot(window);
 }
 
 }  // namespace ws
 
 }  // namespace mus