Update view manager to support content handling.

mojo/services/view_manager/view_manager_service_impl.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 "mojo/services/view_manager/view_manager_service_impl.h"
 
 #include "base/bind.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/view_manager/default_access_policy.h"
@@ skipping 446 matching lines @@
     const Callback<void(bool)>& callback) {
   InterfaceRequest<ServiceProvider> spir;
   spir.Bind(service_provider.PassMessagePipe());
 
   if (NodeIdFromTransportId(transport_view_id) == InvalidNodeId()) {
     root_node_manager_->EmbedRoot(url, spir.Pass());
     callback.Run(true);
     return;
   }
   const Node* node = GetNode(NodeIdFromTransportId(transport_view_id));
-  bool success = node && access_policy_->CanEmbed(node);
-  if (success) {
-    // Only allow a node to be the root for one connection.
-    const NodeId node_id(NodeIdFromTransportId(transport_view_id));
-    ViewManagerServiceImpl* connection_by_url =
-        root_node_manager_->GetConnectionByCreator(id_, url.To<std::string>());
-    ViewManagerServiceImpl* connection_with_node_as_root =
-        root_node_manager_->GetConnectionWithRoot(node_id);
-    if ((connection_by_url != connection_with_node_as_root ||
-         (!connection_by_url && !connection_with_node_as_root)) &&
-        (!connection_by_url || !connection_by_url->HasRoot(node_id))) {
-      RootNodeManager::ScopedChange change(this, root_node_manager_, true);
-      RemoveChildrenAsPartOfEmbed(node_id);
-      // Never message the originating connection.
-      root_node_manager_->OnConnectionMessagedClient(id_);
-      if (connection_with_node_as_root)
-        connection_with_node_as_root->RemoveRoot(node_id);
-      if (connection_by_url) {
-        connection_by_url->AddRoot(node_id, spir.Pass());
-      } else {
-        root_node_manager_->Embed(id_, url, transport_view_id, spir.Pass());
-      }
-    } else {
-      success = false;
-    }
+  if (!node && access_policy_->CanEmbed(node)) {
+    callback.Run(false);
+    return;
   }
-  callback.Run(success);
+
+  // Only allow a node to be the root for one connection.
+  const NodeId node_id(NodeIdFromTransportId(transport_view_id));
+  ViewManagerServiceImpl* existing_owner =
+      root_node_manager_->GetConnectionWithRoot(node_id);
+
+  RootNodeManager::ScopedChange change(this, root_node_manager_, true);
+  if (existing_owner) {
+    RemoveChildrenAsPartOfEmbed(node_id);
+    // Never message the originating connection.
+    root_node_manager_->OnConnectionMessagedClient(id_);
+    existing_owner->RemoveRoot(node_id);
+  }
+  root_node_manager_->Embed(id_, url, transport_view_id, spir.Pass());
+  callback.Run(true);
 }
 
 void ViewManagerServiceImpl::DispatchOnViewInputEvent(Id transport_view_id,
                                                       EventPtr event) {
   // We only allow the WM to dispatch events. At some point this function will
   // move to a separate interface and the check can go away.
   if (id_ != kWindowManagerConnection)
     return;
 
   const NodeId node_id(NodeIdFromTransportId(transport_view_id));
@@ skipping 35 matching lines @@
 
 bool ViewManagerServiceImpl::IsNodeRootOfAnotherConnectionForAccessPolicy(
     const Node* node) const {
   ViewManagerServiceImpl* connection =
       root_node_manager_->GetConnectionWithRoot(node->id());
   return connection && connection != this;
 }
 
 }  // namespace service
 }  // namespace mojo