| 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 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ | 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ |
| 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ | 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 // is returned, any nodes that need to be sent to the client are added to | 129 // is returned, any nodes that need to be sent to the client are added to |
| 130 // |to_send|. | 130 // |to_send|. |
| 131 bool ShouldNotifyOnHierarchyChange(const Node* node, | 131 bool ShouldNotifyOnHierarchyChange(const Node* node, |
| 132 const Node** new_parent, | 132 const Node** new_parent, |
| 133 const Node** old_parent, | 133 const Node** old_parent, |
| 134 std::vector<const Node*>* to_send); | 134 std::vector<const Node*>* to_send); |
| 135 | 135 |
| 136 // Converts an array of Nodes to INodes. This assumes all the nodes are valid | 136 // Converts an array of Nodes to INodes. This assumes all the nodes are valid |
| 137 // for the client. The parent of nodes the client is not allowed to see are | 137 // for the client. The parent of nodes the client is not allowed to see are |
| 138 // set to NULL (in the returned INodes). | 138 // set to NULL (in the returned INodes). |
| 139 Array<INode> NodesToINodes(const std::vector<const Node*>& nodes); | 139 Array<INodePtr> NodesToINodes(const std::vector<const Node*>& nodes); |
| 140 | 140 |
| 141 // Overridden from IViewManager: | 141 // Overridden from IViewManager: |
| 142 virtual void CreateNode(TransportNodeId transport_node_id, | 142 virtual void CreateNode(TransportNodeId transport_node_id, |
| 143 const Callback<void(bool)>& callback) OVERRIDE; | 143 const Callback<void(bool)>& callback) OVERRIDE; |
| 144 virtual void DeleteNode(TransportNodeId transport_node_id, | 144 virtual void DeleteNode(TransportNodeId transport_node_id, |
| 145 const Callback<void(bool)>& callback) OVERRIDE; | 145 const Callback<void(bool)>& callback) OVERRIDE; |
| 146 virtual void AddNode(TransportNodeId parent_id, | 146 virtual void AddNode(TransportNodeId parent_id, |
| 147 TransportNodeId child_id, | 147 TransportNodeId child_id, |
| 148 TransportChangeId server_change_id, | 148 TransportChangeId server_change_id, |
| 149 const Callback<void(bool)>& callback) OVERRIDE; | 149 const Callback<void(bool)>& callback) OVERRIDE; |
| 150 virtual void RemoveNodeFromParent( | 150 virtual void RemoveNodeFromParent( |
| 151 TransportNodeId node_id, | 151 TransportNodeId node_id, |
| 152 TransportChangeId server_change_id, | 152 TransportChangeId server_change_id, |
| 153 const Callback<void(bool)>& callback) OVERRIDE; | 153 const Callback<void(bool)>& callback) OVERRIDE; |
| 154 virtual void GetNodeTree( | 154 virtual void GetNodeTree( |
| 155 TransportNodeId node_id, | 155 TransportNodeId node_id, |
| 156 const Callback<void(Array<INode>)>& callback) OVERRIDE; | 156 const Callback<void(Array<INodePtr>)>& callback) OVERRIDE; |
| 157 virtual void CreateView(TransportViewId transport_view_id, | 157 virtual void CreateView(TransportViewId transport_view_id, |
| 158 const Callback<void(bool)>& callback) OVERRIDE; | 158 const Callback<void(bool)>& callback) OVERRIDE; |
| 159 virtual void DeleteView(TransportViewId transport_view_id, | 159 virtual void DeleteView(TransportViewId transport_view_id, |
| 160 const Callback<void(bool)>& callback) OVERRIDE; | 160 const Callback<void(bool)>& callback) OVERRIDE; |
| 161 virtual void SetView(TransportNodeId transport_node_id, | 161 virtual void SetView(TransportNodeId transport_node_id, |
| 162 TransportViewId transport_view_id, | 162 TransportViewId transport_view_id, |
| 163 const Callback<void(bool)>& callback) OVERRIDE; | 163 const Callback<void(bool)>& callback) OVERRIDE; |
| 164 virtual void SetViewContents(TransportViewId view_id, | 164 virtual void SetViewContents(TransportViewId view_id, |
| 165 ScopedSharedBufferHandle buffer, | 165 ScopedSharedBufferHandle buffer, |
| 166 uint32_t buffer_size, | 166 uint32_t buffer_size, |
| 167 const Callback<void(bool)>& callback) OVERRIDE; | 167 const Callback<void(bool)>& callback) OVERRIDE; |
| 168 virtual void SetNodeBounds(TransportNodeId node_id, | 168 virtual void SetNodeBounds(TransportNodeId node_id, |
| 169 const Rect& bounds, | 169 RectPtr bounds, |
| 170 const Callback<void(bool)>& callback) OVERRIDE; | 170 const Callback<void(bool)>& callback) OVERRIDE; |
| 171 virtual void Connect(const mojo::String& url, | 171 virtual void Connect(const mojo::String& url, |
| 172 const mojo::Array<uint32_t>& node_ids, | 172 mojo::Array<uint32_t> node_ids, |
| 173 const mojo::Callback<void(bool)>& callback) OVERRIDE; | 173 const mojo::Callback<void(bool)>& callback) OVERRIDE; |
| 174 | 174 |
| 175 // Overridden from NodeDelegate: | 175 // Overridden from NodeDelegate: |
| 176 virtual void OnNodeHierarchyChanged(const Node* node, | 176 virtual void OnNodeHierarchyChanged(const Node* node, |
| 177 const Node* new_parent, | 177 const Node* new_parent, |
| 178 const Node* old_parent) OVERRIDE; | 178 const Node* old_parent) OVERRIDE; |
| 179 virtual void OnNodeViewReplaced(const Node* node, | 179 virtual void OnNodeViewReplaced(const Node* node, |
| 180 const View* new_view, | 180 const View* new_view, |
| 181 const View* old_view) OVERRIDE; | 181 const View* old_view) OVERRIDE; |
| 182 | 182 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 209 | 209 |
| 210 #if defined(OS_WIN) | 210 #if defined(OS_WIN) |
| 211 #pragma warning(pop) | 211 #pragma warning(pop) |
| 212 #endif | 212 #endif |
| 213 | 213 |
| 214 } // namespace service | 214 } // namespace service |
| 215 } // namespace view_manager | 215 } // namespace view_manager |
| 216 } // namespace mojo | 216 } // namespace mojo |
| 217 | 217 |
| 218 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ | 218 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ |
| OLD | NEW |