Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Unified Diff: mojo/services/public/cpp/view_manager/view_manager.h

Issue 316083002: Add support for multiple roots to the client lib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/services/public/cpp/view_manager/view_manager.h
diff --git a/mojo/services/public/cpp/view_manager/view_manager.h b/mojo/services/public/cpp/view_manager/view_manager.h
index 34db8e7b7f2b44fadfe904ddf33374522c570ede..28e45625b45c8648e55db235f0ee29b81b6643e5 100644
--- a/mojo/services/public/cpp/view_manager/view_manager.h
+++ b/mojo/services/public/cpp/view_manager/view_manager.h
@@ -34,29 +34,30 @@ class ViewManager {
// and ready to use.
static void Create(
Application* application,
- const base::Callback<void(ViewManager*)> ready_callback);
+ const base::Callback<void(ViewManager*)>& root_added_callback);
// Blocks until ViewManager is ready to use.
- static ViewManager* CreateBlocking(Application* application);
+ static ViewManager* CreateBlocking(
+ Application* application,
+ const base::Callback<void(ViewManager*)>& root_added_callback);
- ViewTreeNode* tree() { return tree_; }
+ const std::vector<ViewTreeNode*>& roots() { return roots_; }
ViewTreeNode* GetNodeById(TransportNodeId id);
View* GetViewById(TransportViewId id);
- void Embed(const String& url, ViewTreeNode* node);
-
private:
friend class ViewManagerPrivate;
typedef std::map<TransportNodeId, ViewTreeNode*> IdToNodeMap;
typedef std::map<TransportViewId, View*> IdToViewMap;
ViewManager(Application* application,
- const base::Callback<void(ViewManager*)> ready_callback);
+ const base::Callback<void(ViewManager*)>& root_added_callback);
- base::Callback<void(ViewManager*)> ready_callback_;
+ base::Callback<void(ViewManager*)> root_added_callback_;
ViewManagerSynchronizer* synchronizer_;
- ViewTreeNode* tree_;
+
+ std::vector<ViewTreeNode*> roots_;
IdToNodeMap nodes_;
IdToViewMap views_;

Powered by Google App Engine
This is Rietveld 408576698