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

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

Issue 304323005: Revert 273723 "Wire input events through the ViewManagerClient i..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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_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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 bool originated_change); 70 bool originated_change);
71 void ProcessNodeHierarchyChanged(const Node* node, 71 void ProcessNodeHierarchyChanged(const Node* node,
72 const Node* new_parent, 72 const Node* new_parent,
73 const Node* old_parent, 73 const Node* old_parent,
74 TransportChangeId server_change_id, 74 TransportChangeId server_change_id,
75 bool originated_change); 75 bool originated_change);
76 void ProcessNodeViewReplaced(const Node* node, 76 void ProcessNodeViewReplaced(const Node* node,
77 const View* new_view, 77 const View* new_view,
78 const View* old_view, 78 const View* old_view,
79 bool originated_change); 79 bool originated_change);
80 void ProcessViewInputEvent(const View* view, const ui::Event* event);
81 void ProcessNodeDeleted(const NodeId& node, 80 void ProcessNodeDeleted(const NodeId& node,
82 TransportChangeId server_change_id, 81 TransportChangeId server_change_id,
83 bool originated_change); 82 bool originated_change);
84 void ProcessViewDeleted(const ViewId& view, bool originated_change); 83 void ProcessViewDeleted(const ViewId& view, bool originated_change);
85 84
86 // TODO(sky): move this to private section (currently can't because of 85 // TODO(sky): move this to private section (currently can't because of
87 // bindings). 86 // bindings).
88 // InterfaceImp overrides: 87 // InterfaceImp overrides:
89 virtual void OnConnectionError() MOJO_OVERRIDE; 88 virtual void OnConnectionError() MOJO_OVERRIDE;
90 89
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 mojo::Array<uint32_t> node_ids, 172 mojo::Array<uint32_t> node_ids,
174 const mojo::Callback<void(bool)>& callback) OVERRIDE; 173 const mojo::Callback<void(bool)>& callback) OVERRIDE;
175 174
176 // Overridden from NodeDelegate: 175 // Overridden from NodeDelegate:
177 virtual void OnNodeHierarchyChanged(const Node* node, 176 virtual void OnNodeHierarchyChanged(const Node* node,
178 const Node* new_parent, 177 const Node* new_parent,
179 const Node* old_parent) OVERRIDE; 178 const Node* old_parent) OVERRIDE;
180 virtual void OnNodeViewReplaced(const Node* node, 179 virtual void OnNodeViewReplaced(const Node* node,
181 const View* new_view, 180 const View* new_view,
182 const View* old_view) OVERRIDE; 181 const View* old_view) OVERRIDE;
183 virtual void OnViewInputEvent(const View* view,
184 const ui::Event* event) OVERRIDE;
185 182
186 // InterfaceImp overrides: 183 // InterfaceImp overrides:
187 virtual void OnConnectionEstablished() MOJO_OVERRIDE; 184 virtual void OnConnectionEstablished() MOJO_OVERRIDE;
188 185
189 RootNodeManager* root_node_manager_; 186 RootNodeManager* root_node_manager_;
190 187
191 // Id of this connection as assigned by RootNodeManager. Assigned in 188 // Id of this connection as assigned by RootNodeManager. Assigned in
192 // OnConnectionEstablished(). 189 // OnConnectionEstablished().
193 TransportConnectionId id_; 190 TransportConnectionId id_;
194 191
(...skipping 17 matching lines...) Expand all
212 209
213 #if defined(OS_WIN) 210 #if defined(OS_WIN)
214 #pragma warning(pop) 211 #pragma warning(pop)
215 #endif 212 #endif
216 213
217 } // namespace service 214 } // namespace service
218 } // namespace view_manager 215 } // namespace view_manager
219 } // namespace mojo 216 } // namespace mojo
220 217
221 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_ 218 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698