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

Side by Side Diff: mojo/services/view_manager/view_manager_service_impl.h

Issue 331243002: Makes IViewManager::DeleteNode take the server_change_id (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 6 years, 6 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_SERVICE_IMPL_H_ 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_ 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 // Converts an array of Nodes to NodeDatas. This assumes all the nodes are 164 // Converts an array of Nodes to NodeDatas. This assumes all the nodes are
165 // valid for the client. The parent of nodes the client is not allowed to see 165 // valid for the client. The parent of nodes the client is not allowed to see
166 // are set to NULL (in the returned NodeDatas). 166 // are set to NULL (in the returned NodeDatas).
167 Array<NodeDataPtr> NodesToNodeDatas(const std::vector<const Node*>& nodes); 167 Array<NodeDataPtr> NodesToNodeDatas(const std::vector<const Node*>& nodes);
168 168
169 // Overridden from ViewManagerService: 169 // Overridden from ViewManagerService:
170 virtual void CreateNode(Id transport_node_id, 170 virtual void CreateNode(Id transport_node_id,
171 const Callback<void(bool)>& callback) OVERRIDE; 171 const Callback<void(bool)>& callback) OVERRIDE;
172 virtual void DeleteNode(Id transport_node_id, 172 virtual void DeleteNode(Id transport_node_id,
173 Id server_change_id,
173 const Callback<void(bool)>& callback) OVERRIDE; 174 const Callback<void(bool)>& callback) OVERRIDE;
174 virtual void AddNode(Id parent_id, 175 virtual void AddNode(Id parent_id,
175 Id child_id, 176 Id child_id,
176 Id server_change_id, 177 Id server_change_id,
177 const Callback<void(bool)>& callback) OVERRIDE; 178 const Callback<void(bool)>& callback) OVERRIDE;
178 virtual void RemoveNodeFromParent( 179 virtual void RemoveNodeFromParent(
179 Id node_id, 180 Id node_id,
180 Id server_change_id, 181 Id server_change_id,
181 const Callback<void(bool)>& callback) OVERRIDE; 182 const Callback<void(bool)>& callback) OVERRIDE;
182 virtual void ReorderNode(Id node_id, 183 virtual void ReorderNode(Id node_id,
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 259
259 #if defined(OS_WIN) 260 #if defined(OS_WIN)
260 #pragma warning(pop) 261 #pragma warning(pop)
261 #endif 262 #endif
262 263
263 } // namespace service 264 } // namespace service
264 } // namespace view_manager 265 } // namespace view_manager
265 } // namespace mojo 266 } // namespace mojo
266 267
267 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_ 268 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698