Revert of Converts chrome to aura-mus

services/ui/ws/window_tree.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 "services/ui/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 265 matching lines @@
   created_window_map_[window_id] = window;
   client_id_to_window_id_map_[client_window_id] = window_id;
   window_id_to_client_id_map_[window_id] = client_window_id;
   return true;
 }
 
 bool WindowTree::AddWindow(const ClientWindowId& parent_id,
                            const ClientWindowId& child_id) {
   ServerWindow* parent = GetWindowByClientId(parent_id);
   ServerWindow* child = GetWindowByClientId(child_id);
-  DVLOG(3) << "add window client=" << id_
-           << " client parent window_id=" << parent_id.id
-           << " global window_id="
-           << (parent ? WindowIdToTransportId(parent->id()) : 0)
-           << " client child window_id= " << child_id.id << " global window_id="
-           << (child ? WindowIdToTransportId(child->id()) : 0);
-  if (!parent) {
-    DVLOG(1) << "add failed, no parent";
-    return false;
+  if (parent && child && child->parent() != parent &&
+      !child->Contains(parent) && access_policy_->CanAddWindow(parent, child)) {
+    Operation op(this, window_server_, OperationType::ADD_WINDOW);
+    parent->Add(child);
+    return true;
   }
-  if (!child) {
-    DVLOG(1) << "add failed, no child";
-    return false;
-  }
-  if (child->parent() == parent) {
-    DVLOG(1) << "add failed, already has parent";
-    return false;
-  }
-  if (child->Contains(parent)) {
-    DVLOG(1) << "add failed, child contains parent";
-    return false;
-  }
-  if (!access_policy_->CanAddWindow(parent, child)) {
-    DVLOG(1) << "add failed, access policy denied add";
-    return false;
-  }
-  Operation op(this, window_server_, OperationType::ADD_WINDOW);
-  parent->Add(child);
-  return true;
+  return false;
 }
 
 bool WindowTree::AddTransientWindow(const ClientWindowId& window_id,
                                     const ClientWindowId& transient_window_id) {
   ServerWindow* window = GetWindowByClientId(window_id);
   ServerWindow* transient_window = GetWindowByClientId(transient_window_id);
   if (window && transient_window && !transient_window->Contains(window) &&
       access_policy_->CanAddTransientWindow(window, transient_window)) {
     Operation op(this, window_server_, OperationType::ADD_TRANSIENT_WINDOW);
     return window->AddTransientWindow(transient_window);
@@ skipping 1691 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui