OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "mojo/services/view_manager/node.h" | 5 #include "mojo/services/view_manager/node.h" |
6 | 6 |
7 #include "mojo/services/view_manager/node_delegate.h" | 7 #include "mojo/services/view_manager/node_delegate.h" |
8 #include "mojo/services/view_manager/view.h" | 8 #include "mojo/services/view_manager/view.h" |
9 #include "ui/aura/window_property.h" | 9 #include "ui/aura/window_property.h" |
10 #include "ui/base/cursor/cursor.h" | 10 #include "ui/base/cursor/cursor.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 } | 55 } |
56 | 56 |
57 std::vector<Node*> Node::GetChildren() { | 57 std::vector<Node*> Node::GetChildren() { |
58 std::vector<Node*> children; | 58 std::vector<Node*> children; |
59 children.reserve(window_.children().size()); | 59 children.reserve(window_.children().size()); |
60 for (size_t i = 0; i < window_.children().size(); ++i) | 60 for (size_t i = 0; i < window_.children().size(); ++i) |
61 children.push_back(window_.children()[i]->GetProperty(kNodeKey)); | 61 children.push_back(window_.children()[i]->GetProperty(kNodeKey)); |
62 return children; | 62 return children; |
63 } | 63 } |
64 | 64 |
65 void Node::SetView(View* view) { | 65 void Node::SetView(service::View* view) { |
66 if (view == view_) | 66 if (view == view_) |
67 return; | 67 return; |
68 | 68 |
69 // Detach view from existing node. This way notifications are sent out. | 69 // Detach view from existing node. This way notifications are sent out. |
70 if (view && view->node()) | 70 if (view && view->node()) |
71 view->node()->SetView(NULL); | 71 view->node()->SetView(NULL); |
72 | 72 |
73 ViewId old_view_id; | 73 ViewId old_view_id; |
74 if (view_) { | 74 if (view_) { |
75 view_->set_node(NULL); | 75 view_->set_node(NULL); |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 bool Node::HasHitTestMask() const { | 152 bool Node::HasHitTestMask() const { |
153 return false; | 153 return false; |
154 } | 154 } |
155 | 155 |
156 void Node::GetHitTestMask(gfx::Path* mask) const { | 156 void Node::GetHitTestMask(gfx::Path* mask) const { |
157 } | 157 } |
158 | 158 |
159 } // namespace view_manager | 159 } // namespace view_manager |
160 } // namespace services | 160 } // namespace services |
161 } // namespace mojo | 161 } // namespace mojo |
OLD | NEW |