| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 TransportChangeId server_change_id, | 78 TransportChangeId server_change_id, |
| 79 bool originated_change); | 79 bool originated_change); |
| 80 void ProcessNodeViewReplaced(const Node* node, | 80 void ProcessNodeViewReplaced(const Node* node, |
| 81 const View* new_view, | 81 const View* new_view, |
| 82 const View* old_view, | 82 const View* old_view, |
| 83 bool originated_change); | 83 bool originated_change); |
| 84 void ProcessNodeDeleted(const NodeId& node, | 84 void ProcessNodeDeleted(const NodeId& node, |
| 85 TransportChangeId server_change_id, | 85 TransportChangeId server_change_id, |
| 86 bool originated_change); | 86 bool originated_change); |
| 87 void ProcessViewDeleted(const ViewId& view, bool originated_change); | 87 void ProcessViewDeleted(const ViewId& view, bool originated_change); |
| 88 void ProcessViewInputEvent(const View* view, const ui::Event* event); |
| 88 | 89 |
| 89 // TODO(sky): move this to private section (currently can't because of | 90 // TODO(sky): move this to private section (currently can't because of |
| 90 // bindings). | 91 // bindings). |
| 91 // InterfaceImp overrides: | 92 // InterfaceImp overrides: |
| 92 virtual void OnConnectionError() MOJO_OVERRIDE; | 93 virtual void OnConnectionError() MOJO_OVERRIDE; |
| 93 | 94 |
| 94 private: | 95 private: |
| 95 typedef std::map<TransportConnectionSpecificNodeId, Node*> NodeMap; | 96 typedef std::map<TransportConnectionSpecificNodeId, Node*> NodeMap; |
| 96 typedef std::map<TransportConnectionSpecificViewId, View*> ViewMap; | 97 typedef std::map<TransportConnectionSpecificViewId, View*> ViewMap; |
| 97 typedef base::hash_set<TransportNodeId> NodeIdSet; | 98 typedef base::hash_set<TransportNodeId> NodeIdSet; |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 mojo::Array<uint32_t> node_ids, | 177 mojo::Array<uint32_t> node_ids, |
| 177 const mojo::Callback<void(bool)>& callback) OVERRIDE; | 178 const mojo::Callback<void(bool)>& callback) OVERRIDE; |
| 178 | 179 |
| 179 // Overridden from NodeDelegate: | 180 // Overridden from NodeDelegate: |
| 180 virtual void OnNodeHierarchyChanged(const Node* node, | 181 virtual void OnNodeHierarchyChanged(const Node* node, |
| 181 const Node* new_parent, | 182 const Node* new_parent, |
| 182 const Node* old_parent) OVERRIDE; | 183 const Node* old_parent) OVERRIDE; |
| 183 virtual void OnNodeViewReplaced(const Node* node, | 184 virtual void OnNodeViewReplaced(const Node* node, |
| 184 const View* new_view, | 185 const View* new_view, |
| 185 const View* old_view) OVERRIDE; | 186 const View* old_view) OVERRIDE; |
| 187 virtual void OnViewInputEvent(const View* view, |
| 188 const ui::Event* event) OVERRIDE; |
| 186 | 189 |
| 187 // InterfaceImp overrides: | 190 // InterfaceImp overrides: |
| 188 virtual void OnConnectionEstablished() MOJO_OVERRIDE; | 191 virtual void OnConnectionEstablished() MOJO_OVERRIDE; |
| 189 | 192 |
| 190 RootNodeManager* root_node_manager_; | 193 RootNodeManager* root_node_manager_; |
| 191 | 194 |
| 192 // Id of this connection as assigned by RootNodeManager. | 195 // Id of this connection as assigned by RootNodeManager. |
| 193 const TransportConnectionId id_; | 196 const TransportConnectionId id_; |
| 194 | 197 |
| 195 NodeMap node_map_; | 198 NodeMap node_map_; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 215 | 218 |
| 216 #if defined(OS_WIN) | 219 #if defined(OS_WIN) |
| 217 #pragma warning(pop) | 220 #pragma warning(pop) |
| 218 #endif | 221 #endif |
| 219 | 222 |
| 220 } // namespace service | 223 } // namespace service |
| 221 } // namespace view_manager | 224 } // namespace view_manager |
| 222 } // namespace mojo | 225 } // namespace mojo |
| 223 | 226 |
| 224 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ | 227 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ |
| OLD | NEW |