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

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

Issue 286973009: Revert 270925 "Tweaks to ViewManager:" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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/view_manager/node.cc
===================================================================
--- trunk/src/mojo/services/view_manager/node.cc (revision 270932)
+++ trunk/src/mojo/services/view_manager/node.cc (working copy)
@@ -40,7 +40,7 @@
SetView(NULL);
}
-const Node* Node::GetParent() const {
+Node* Node::GetParent() {
if (!window_.parent())
return NULL;
return window_.parent()->GetProperty(kNodeKey);
@@ -54,13 +54,6 @@
window_.RemoveChild(&child->window_);
}
-const Node* Node::GetRoot() const {
- const aura::Window* window = &window_;
- while (window && window->parent())
- window = window->parent();
- return window->GetProperty(kNodeKey);
-}
-
std::vector<Node*> Node::GetChildren() {
std::vector<Node*> children;
children.reserve(window_.children().size());
@@ -69,10 +62,6 @@
return children;
}
-bool Node::Contains(const Node* node) const {
- return node && window_.Contains(&(node->window_));
-}
-
void Node::SetView(View* view) {
if (view == view_)
return;
« no previous file with comments | « trunk/src/mojo/services/view_manager/node.h ('k') | trunk/src/mojo/services/view_manager/root_node_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698