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_CONNECTION_MANAGER_H_ | 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
6 #define MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 6 #define MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 virtual void OnWillChangeViewHierarchy(const ServerView* view, | 165 virtual void OnWillChangeViewHierarchy(const ServerView* view, |
166 const ServerView* new_parent, | 166 const ServerView* new_parent, |
167 const ServerView* old_parent) OVERRIDE; | 167 const ServerView* old_parent) OVERRIDE; |
168 virtual void OnViewHierarchyChanged(const ServerView* view, | 168 virtual void OnViewHierarchyChanged(const ServerView* view, |
169 const ServerView* new_parent, | 169 const ServerView* new_parent, |
170 const ServerView* old_parent) OVERRIDE; | 170 const ServerView* old_parent) OVERRIDE; |
171 virtual void OnViewBoundsChanged(const ServerView* view, | 171 virtual void OnViewBoundsChanged(const ServerView* view, |
172 const gfx::Rect& old_bounds, | 172 const gfx::Rect& old_bounds, |
173 const gfx::Rect& new_bounds) OVERRIDE; | 173 const gfx::Rect& new_bounds) OVERRIDE; |
174 virtual void OnViewSurfaceIdChanged(const ServerView* view) OVERRIDE; | 174 virtual void OnViewSurfaceIdChanged(const ServerView* view) OVERRIDE; |
| 175 virtual void OnViewReordered(const ServerView* view, |
| 176 const ServerView* relative, |
| 177 OrderDirection direction) OVERRIDE; |
175 virtual void OnWillChangeViewVisibility(const ServerView* view) OVERRIDE; | 178 virtual void OnWillChangeViewVisibility(const ServerView* view) OVERRIDE; |
176 | 179 |
177 ApplicationConnection* app_connection_; | 180 ApplicationConnection* app_connection_; |
178 | 181 |
179 // ID to use for next ViewManagerServiceImpl. | 182 // ID to use for next ViewManagerServiceImpl. |
180 ConnectionSpecificId next_connection_id_; | 183 ConnectionSpecificId next_connection_id_; |
181 | 184 |
182 // Set of ViewManagerServiceImpls. | 185 // Set of ViewManagerServiceImpls. |
183 ConnectionMap connection_map_; | 186 ConnectionMap connection_map_; |
184 | 187 |
185 DisplayManager display_manager_; | 188 DisplayManager display_manager_; |
186 | 189 |
187 scoped_ptr<ServerView> root_; | 190 scoped_ptr<ServerView> root_; |
188 | 191 |
189 // Set of ViewManagerServiceImpls created by way of Connect(). These have to | 192 // Set of ViewManagerServiceImpls created by way of Connect(). These have to |
190 // be explicitly destroyed. | 193 // be explicitly destroyed. |
191 std::set<ViewManagerServiceImpl*> connections_created_by_connect_; | 194 std::set<ViewManagerServiceImpl*> connections_created_by_connect_; |
192 | 195 |
193 // If non-null we're processing a change. The ScopedChange is not owned by us | 196 // If non-null we're processing a change. The ScopedChange is not owned by us |
194 // (it's created on the stack by ViewManagerServiceImpl). | 197 // (it's created on the stack by ViewManagerServiceImpl). |
195 ScopedChange* current_change_; | 198 ScopedChange* current_change_; |
196 | 199 |
197 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 200 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
198 }; | 201 }; |
199 | 202 |
200 } // namespace service | 203 } // namespace service |
201 } // namespace mojo | 204 } // namespace mojo |
202 | 205 |
203 #endif // MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 206 #endif // MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
OLD | NEW |