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

Unified Diff: trunk/src/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc

Issue 261513002: Revert 266940 "First step at synchronizing client model changes ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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: trunk/src/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc (revision 266943)
+++ trunk/src/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc (working copy)
@@ -4,8 +4,6 @@
#include "mojo/services/public/cpp/view_manager/view_tree_node.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
#include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
#include "mojo/services/public/cpp/view_manager/view_tree_node_observer.h"
@@ -90,18 +88,8 @@
////////////////////////////////////////////////////////////////////////////////
// ViewTreeNode, public:
-ViewTreeNode::ViewTreeNode()
- : manager_(NULL),
- id_(-1),
- owned_by_parent_(true),
- parent_(NULL) {}
+ViewTreeNode::ViewTreeNode() : owned_by_parent_(true), parent_(NULL) {}
-ViewTreeNode::ViewTreeNode(ViewManager* manager)
- : manager_(manager),
- id_(ViewManagerPrivate(manager).synchronizer()->CreateViewTreeNode()),
- owned_by_parent_(true),
- parent_(NULL) {}
-
ViewTreeNode::~ViewTreeNode() {
while (!children_.empty()) {
ViewTreeNode* child = children_.front();
@@ -134,14 +122,12 @@
RemoveChildImpl(child, &child->parent_->children_);
children_.push_back(child);
child->parent_ = this;
- ViewManagerPrivate(manager_).synchronizer()->AddChild(child->id(), id_);
}
void ViewTreeNode::RemoveChild(ViewTreeNode* child) {
DCHECK_EQ(this, child->parent());
ScopedTreeNotifier(child, this, NULL);
RemoveChildImpl(child, &children_);
- ViewManagerPrivate(manager_).synchronizer()->RemoveChild(child->id(), id_);
}
bool ViewTreeNode::Contains(ViewTreeNode* child) const {

Powered by Google App Engine
This is Rietveld 408576698