Add support for multiple roots to the client lib.

mojo/services/public/cpp/view_manager/lib/view_manager.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/public/cpp/view_manager/view_manager.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
@@ skipping 25 matching lines @@
   while (!views_.empty()) {
     IdToViewMap::iterator it = views_.begin();
     if (synchronizer_->OwnsView(it->second->id()))
       it->second->Destroy();
     else
       views_.erase(it);
   }
 }
 
 // static
-ViewManager* ViewManager::CreateBlocking(Application* application) {
+ViewManager* ViewManager::CreateBlocking(
+    Application* application,
+    const base::Callback<void(ViewManager*)>& root_added_callback) {
   base::RunLoop init_loop;
   ViewManager* manager = new ViewManager(
       application,
       base::Bind(&OnViewManagerReady, &init_loop));
   init_loop.Run();
   return manager;
 }
 
 // static
 void ViewManager::Create(
     Application* application,
-    const base::Callback<void(ViewManager*)> ready_callback) {
-  new ViewManager(application, ready_callback);
+    const base::Callback<void(ViewManager*)>& root_added_callback) {
+  new ViewManager(application, root_added_callback);
 }
 
 ViewTreeNode* ViewManager::GetNodeById(TransportNodeId id) {
   IdToNodeMap::const_iterator it = nodes_.find(id);
   return it != nodes_.end() ? it->second : NULL;
 }
 
 View* ViewManager::GetViewById(TransportViewId id) {
   IdToViewMap::const_iterator it = views_.find(id);
   return it != views_.end() ? it->second : NULL;
 }
 
-void ViewManager::Embed(const String& url, ViewTreeNode* node) {
-  synchronizer_->Embed(url, node->id());
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ViewManager, private:
 
 ViewManager::ViewManager(
     Application* application,
-    const base::Callback<void(ViewManager*)> ready_callback)
-    : ready_callback_(ready_callback),
-      synchronizer_(NULL),
-      tree_(NULL) {
+    const base::Callback<void(ViewManager*)>& root_added_callback)
+    : root_added_callback_(root_added_callback),
+      synchronizer_(NULL) {
   application->AddService<ViewManagerSynchronizer>(this);
 }
 
 }  // namespace view_manager
 }  // namespace mojo