Index: mojo/services/view_manager/root_node_manager.cc |
diff --git a/mojo/services/view_manager/root_node_manager.cc b/mojo/services/view_manager/root_node_manager.cc |
index fe608e822fe27411cc13b40d83343c9a4f01060e..317dad23f16bcc07936923b2b6c4bb1203b90a81 100644 |
--- a/mojo/services/view_manager/root_node_manager.cc |
+++ b/mojo/services/view_manager/root_node_manager.cc |
@@ -88,8 +88,12 @@ void RootNodeManager::RemoveConnection(ViewManagerServiceImpl* connection) { |
} |
void RootNodeManager::EmbedRoot(const std::string& url) { |
- CHECK(connection_map_.empty()); |
- EmbedImpl(kRootConnection, String::From(url), InvalidNodeId()); |
+ if (connection_map_.empty()) { |
+ EmbedImpl(kRootConnection, String::From(url), InvalidNodeId()); |
+ return; |
+ } |
+ ViewManagerServiceImpl* connection = GetConnection(kWindowManagerConnection); |
+ connection->client()->EmbedRoot(url); |
} |
void RootNodeManager::Embed(ConnectionSpecificId creator_id, |