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

Unified Diff: trunk/src/mojo/services/view_manager/node.cc

Issue 250733003: Revert 266159 "Adds more to viewmanager" (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
« no previous file with comments | « trunk/src/mojo/services/view_manager/node.h ('k') | trunk/src/mojo/services/view_manager/node_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/services/view_manager/node.cc
===================================================================
--- trunk/src/mojo/services/view_manager/node.cc (revision 266161)
+++ trunk/src/mojo/services/view_manager/node.cc (working copy)
@@ -5,7 +5,6 @@
#include "mojo/services/view_manager/node.h"
#include "mojo/services/view_manager/node_delegate.h"
-#include "mojo/services/view_manager/view.h"
#include "ui/aura/window_property.h"
DECLARE_WINDOW_PROPERTY_TYPE(mojo::services::view_manager::Node*);
@@ -19,7 +18,6 @@
Node::Node(NodeDelegate* delegate, const NodeId& id)
: delegate_(delegate),
id_(id),
- view_(NULL),
window_(NULL) {
DCHECK(delegate); // Must provide a delegate.
window_.set_owned_by_parent(false);
@@ -28,7 +26,6 @@
}
Node::~Node() {
- SetView(NULL);
}
Node* Node::GetParent() {
@@ -45,36 +42,6 @@
window_.RemoveChild(&child->window_);
}
-std::vector<Node*> Node::GetChildren() {
- std::vector<Node*> children;
- children.reserve(window_.children().size());
- for (size_t i = 0; i < window_.children().size(); ++i)
- children.push_back(window_.children()[i]->GetProperty(kNodeKey));
- return children;
-}
-
-void Node::SetView(View* view) {
- if (view == view_)
- return;
-
- // Detach view from existing node. This way notifications are sent out.
- if (view && view->node())
- view->node()->SetView(NULL);
-
- ViewId old_view_id;
- if (view_) {
- view_->set_node(NULL);
- old_view_id = view_->id();
- }
- view_ = view;
- ViewId view_id;
- if (view) {
- view_id = view->id();
- view->set_node(this);
- }
- delegate_->OnNodeViewReplaced(id_, view_id, old_view_id);
-}
-
void Node::OnWindowHierarchyChanged(
const aura::WindowObserver::HierarchyChangeParams& params) {
if (params.target != &window_ || params.receiver != &window_)
« no previous file with comments | « trunk/src/mojo/services/view_manager/node.h ('k') | trunk/src/mojo/services/view_manager/node_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698