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

Unified Diff: mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

Issue 311373005: Nesting (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/lib/view_manager_synchronizer.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
index cb16cbcd2368c4e9c6150e618c64f5d4d61d7409..be24cec1828ad1f8092c783d11cb17e0aceb1c77 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
@@ -437,18 +437,16 @@ class EmbedTransaction : public ViewManagerTransaction {
DISALLOW_COPY_AND_ASSIGN(EmbedTransaction);
};
-ViewManagerSynchronizer::ViewManagerSynchronizer(ViewManager* view_manager)
- : view_manager_(view_manager),
+ViewManagerSynchronizer::ViewManagerSynchronizer(ViewManagerDelegate* delegate)
+ : view_manager_(new ViewManager(this, delegate)),
connected_(false),
connection_id_(0),
next_id_(1),
next_server_change_id_(0),
sync_factory_(this) {
- ViewManagerPrivate(view_manager).set_synchronizer(this);
}
ViewManagerSynchronizer::~ViewManagerSynchronizer() {
- view_manager_.reset();
}
TransportNodeId ViewManagerSynchronizer::CreateViewTreeNode() {
@@ -652,7 +650,6 @@ void ViewManagerSynchronizer::OnViewInputEvent(
ack_callback.Run();
}
-
////////////////////////////////////////////////////////////////////////////////
// ViewManagerSynchronizer, private:

Powered by Google App Engine
This is Rietveld 408576698