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

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

Issue 253883005: Makes change_id unsigned (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to trunk 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"
11 #include "mojo/public/cpp/shell/service.h" 11 #include "mojo/public/cpp/shell/service.h"
12 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" 12 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
13 #include "mojo/services/view_manager/ids.h"
13 #include "mojo/services/view_manager/node_delegate.h" 14 #include "mojo/services/view_manager/node_delegate.h"
14 #include "mojo/services/view_manager/view_manager_export.h" 15 #include "mojo/services/view_manager/view_manager_export.h"
15 16
16 namespace mojo { 17 namespace mojo {
17 namespace services { 18 namespace services {
18 namespace view_manager { 19 namespace view_manager {
19 20
20 class Node; 21 class Node;
21 class RootNodeManager; 22 class RootNodeManager;
22 class View; 23 class View;
(...skipping 17 matching lines...) Expand all
40 // Returns the Node with the specified id. 41 // Returns the Node with the specified id.
41 Node* GetNode(const NodeId& id); 42 Node* GetNode(const NodeId& id);
42 43
43 // Returns the View with the specified id. 44 // Returns the View with the specified id.
44 View* GetView(const ViewId& id); 45 View* GetView(const ViewId& id);
45 46
46 // Notifies the client of a hierarchy change. 47 // Notifies the client of a hierarchy change.
47 void NotifyNodeHierarchyChanged(const NodeId& node, 48 void NotifyNodeHierarchyChanged(const NodeId& node,
48 const NodeId& new_parent, 49 const NodeId& new_parent,
49 const NodeId& old_parent, 50 const NodeId& old_parent,
50 int32_t change_id); 51 ChangeId change_id);
51 void NotifyNodeViewReplaced(const NodeId& node, 52 void NotifyNodeViewReplaced(const NodeId& node,
52 const ViewId& new_view_id, 53 const ViewId& new_view_id,
53 const ViewId& old_view_id, 54 const ViewId& old_view_id,
54 int32_t change_id); 55 ChangeId change_id);
55 56
56 private: 57 private:
57 typedef std::map<uint16_t, Node*> NodeMap; 58 typedef std::map<uint16_t, Node*> NodeMap;
58 typedef std::map<uint16_t, View*> ViewMap; 59 typedef std::map<uint16_t, View*> ViewMap;
59 60
60 // 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|
61 // is the connection that originated the change. 62 // is the connection that originated the change.
62 bool DeleteNodeImpl(ViewManagerConnection* source, 63 bool DeleteNodeImpl(ViewManagerConnection* source,
63 const NodeId& node_id, 64 const NodeId& node_id,
64 int32_t change_id); 65 ChangeId change_id);
65 66
66 // Deletes a view owned by this connection. Returns true on success. |source| 67 // Deletes a view owned by this connection. Returns true on success. |source|
67 // is the connection that originated the change. 68 // is the connection that originated the change.
68 bool DeleteViewImpl(ViewManagerConnection* source, 69 bool DeleteViewImpl(ViewManagerConnection* source,
69 const ViewId& view_id, 70 const ViewId& view_id,
70 int32_t change_id); 71 ChangeId change_id);
71 72
72 // Sets the view associated with a node. 73 // Sets the view associated with a node.
73 bool SetViewImpl(const NodeId& node_id, 74 bool SetViewImpl(const NodeId& node_id,
74 const ViewId& view_id, 75 const ViewId& view_id,
75 int32_t change_id); 76 ChangeId change_id);
76 77
77 // Overridden from ViewManager: 78 // Overridden from ViewManager:
78 virtual void CreateNode(uint16_t node_id, 79 virtual void CreateNode(uint16_t node_id,
79 const Callback<void(bool)>& callback) OVERRIDE; 80 const Callback<void(bool)>& callback) OVERRIDE;
80 virtual void DeleteNode(uint32_t transport_node_id, 81 virtual void DeleteNode(uint32_t transport_node_id,
81 int32_t change_id, 82 ChangeId change_id,
82 const mojo::Callback<void(bool)>& callback) OVERRIDE; 83 const mojo::Callback<void(bool)>& callback) OVERRIDE;
83 virtual void AddNode(uint32_t parent_id, 84 virtual void AddNode(uint32_t parent_id,
84 uint32_t child_id, 85 uint32_t child_id,
85 int32_t change_id, 86 ChangeId change_id,
86 const Callback<void(bool)>& callback) OVERRIDE; 87 const Callback<void(bool)>& callback) OVERRIDE;
87 virtual void RemoveNodeFromParent( 88 virtual void RemoveNodeFromParent(
88 uint32_t node_id, 89 uint32_t node_id,
89 int32_t change_id, 90 ChangeId change_id,
90 const Callback<void(bool)>& callback) OVERRIDE; 91 const Callback<void(bool)>& callback) OVERRIDE;
91 virtual void CreateView(uint16_t view_id, 92 virtual void CreateView(uint16_t view_id,
92 const mojo::Callback<void(bool)>& callback) OVERRIDE; 93 const mojo::Callback<void(bool)>& callback) OVERRIDE;
93 virtual void DeleteView(uint32_t transport_view_id, 94 virtual void DeleteView(uint32_t transport_view_id,
94 int32_t change_id, 95 ChangeId change_id,
95 const mojo::Callback<void(bool)>& callback) OVERRIDE; 96 const mojo::Callback<void(bool)>& callback) OVERRIDE;
96 virtual void SetView(uint32_t transport_node_id, 97 virtual void SetView(uint32_t transport_node_id,
97 uint32_t transport_view_id, 98 uint32_t transport_view_id,
98 int32_t change_id, 99 ChangeId change_id,
99 const mojo::Callback<void(bool)>& callback) OVERRIDE; 100 const mojo::Callback<void(bool)>& callback) OVERRIDE;
100 101
101 // Overriden from NodeDelegate: 102 // Overriden from NodeDelegate:
102 virtual void OnNodeHierarchyChanged(const NodeId& node, 103 virtual void OnNodeHierarchyChanged(const NodeId& node,
103 const NodeId& new_parent, 104 const NodeId& new_parent,
104 const NodeId& old_parent) OVERRIDE; 105 const NodeId& old_parent) OVERRIDE;
105 virtual void OnNodeViewReplaced(const NodeId& node, 106 virtual void OnNodeViewReplaced(const NodeId& node,
106 const ViewId& new_view_id, 107 const ViewId& new_view_id,
107 const ViewId& old_view_id) OVERRIDE; 108 const ViewId& old_view_id) OVERRIDE;
108 109
109 // Id of this connection as assigned by RootNodeManager. Assigned in 110 // Id of this connection as assigned by RootNodeManager. Assigned in
110 // Initialize(). 111 // Initialize().
111 uint16_t id_; 112 uint16_t id_;
112 113
113 NodeMap node_map_; 114 NodeMap node_map_;
114 115
115 ViewMap view_map_; 116 ViewMap view_map_;
116 117
117 DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection); 118 DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection);
118 }; 119 };
119 120
120 } // namespace view_manager 121 } // namespace view_manager
121 } // namespace services 122 } // namespace services
122 } // namespace mojo 123 } // namespace mojo
123 124
124 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ 125 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
OLDNEW
« no previous file with comments | « mojo/services/view_manager/root_node_manager.cc ('k') | mojo/services/view_manager/view_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698