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

Side by Side Diff: trunk/src/mojo/services/view_manager/view_manager_connection.h

Issue 280023002: Revert 269414 "Changes to deletion/ownership of nodes in the cli..." (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 // Notifies the client of a hierarchy change. 47 // Notifies the client of a hierarchy change.
48 void NotifyNodeHierarchyChanged(const NodeId& node, 48 void NotifyNodeHierarchyChanged(const NodeId& node,
49 const NodeId& new_parent, 49 const NodeId& new_parent,
50 const NodeId& old_parent, 50 const NodeId& old_parent,
51 TransportChangeId change_id); 51 TransportChangeId change_id);
52 void NotifyNodeViewReplaced(const NodeId& node, 52 void NotifyNodeViewReplaced(const NodeId& node,
53 const ViewId& new_view_id, 53 const ViewId& new_view_id,
54 const ViewId& old_view_id, 54 const ViewId& old_view_id,
55 TransportChangeId change_id); 55 TransportChangeId change_id);
56 void NotifyNodeDeleted(const NodeId& node, TransportChangeId change_id);
57 56
58 private: 57 private:
59 typedef std::map<TransportConnectionSpecificNodeId, Node*> NodeMap; 58 typedef std::map<TransportConnectionSpecificNodeId, Node*> NodeMap;
60 typedef std::map<TransportConnectionSpecificViewId, View*> ViewMap; 59 typedef std::map<TransportConnectionSpecificViewId, View*> ViewMap;
61 60
62 // Deletes a node owned by this connection. Returns true on success. |source| 61 // Deletes a node owned by this connection. Returns true on success. |source|
63 // is the connection that originated the change. 62 // is the connection that originated the change.
64 bool DeleteNodeImpl(ViewManagerConnection* source, 63 bool DeleteNodeImpl(ViewManagerConnection* source,
65 const NodeId& node_id, 64 const NodeId& node_id,
66 TransportChangeId change_id); 65 TransportChangeId change_id);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ViewMap view_map_; 122 ViewMap view_map_;
124 123
125 DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection); 124 DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection);
126 }; 125 };
127 126
128 } // namespace view_manager 127 } // namespace view_manager
129 } // namespace services 128 } // namespace services
130 } // namespace mojo 129 } // namespace mojo
131 130
132 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ 131 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698