| 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 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 const NodeId& old_parent, | 56 const NodeId& old_parent, |
| 57 TransportChangeId server_change_id, | 57 TransportChangeId server_change_id, |
| 58 TransportChangeId client_change_id); | 58 TransportChangeId client_change_id); |
| 59 void NotifyNodeViewReplaced(const NodeId& node, | 59 void NotifyNodeViewReplaced(const NodeId& node, |
| 60 const ViewId& new_view_id, | 60 const ViewId& new_view_id, |
| 61 const ViewId& old_view_id, | 61 const ViewId& old_view_id, |
| 62 TransportChangeId client_change_id); | 62 TransportChangeId client_change_id); |
| 63 void NotifyNodeDeleted(const NodeId& node, | 63 void NotifyNodeDeleted(const NodeId& node, |
| 64 TransportChangeId server_change_id, | 64 TransportChangeId server_change_id, |
| 65 TransportChangeId client_change_id); | 65 TransportChangeId client_change_id); |
| 66 void NotifyViewDeleted(const ViewId& view, | |
| 67 TransportChangeId server_change_id, | |
| 68 TransportChangeId client_change_id); | |
| 69 | 66 |
| 70 private: | 67 private: |
| 71 typedef std::map<TransportConnectionSpecificNodeId, Node*> NodeMap; | 68 typedef std::map<TransportConnectionSpecificNodeId, Node*> NodeMap; |
| 72 typedef std::map<TransportConnectionSpecificViewId, View*> ViewMap; | 69 typedef std::map<TransportConnectionSpecificViewId, View*> ViewMap; |
| 73 | 70 |
| 74 // Deletes a node owned by this connection. Returns true on success. |source| | 71 // Deletes a node owned by this connection. Returns true on success. |source| |
| 75 // is the connection that originated the change. | 72 // is the connection that originated the change. |
| 76 bool DeleteNodeImpl(ViewManagerConnection* source, | 73 bool DeleteNodeImpl(ViewManagerConnection* source, |
| 77 const NodeId& node_id, | 74 const NodeId& node_id, |
| 78 TransportChangeId change_id); | 75 TransportChangeId change_id); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 138 |
| 142 #if defined(OS_WIN) | 139 #if defined(OS_WIN) |
| 143 #pragma warning(pop) | 140 #pragma warning(pop) |
| 144 #endif | 141 #endif |
| 145 | 142 |
| 146 } // namespace view_manager | 143 } // namespace view_manager |
| 147 } // namespace services | 144 } // namespace services |
| 148 } // namespace mojo | 145 } // namespace mojo |
| 149 | 146 |
| 150 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ | 147 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ |
| OLD | NEW |