| 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 COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 5 #ifndef COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
| 6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 82 |
| 83 // Returns the id for the next ViewManagerServiceImpl. | 83 // Returns the id for the next ViewManagerServiceImpl. |
| 84 mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId(); | 84 mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId(); |
| 85 | 85 |
| 86 // Invoked when a ViewManagerServiceImpl's connection encounters an error. | 86 // Invoked when a ViewManagerServiceImpl's connection encounters an error. |
| 87 void OnConnectionError(ClientConnection* connection); | 87 void OnConnectionError(ClientConnection* connection); |
| 88 | 88 |
| 89 // See description of ViewManagerService::Embed() for details. This assumes | 89 // See description of ViewManagerService::Embed() for details. This assumes |
| 90 // |transport_view_id| is valid. | 90 // |transport_view_id| is valid. |
| 91 void EmbedAtView(mojo::ConnectionSpecificId creator_id, | 91 void EmbedAtView(mojo::ConnectionSpecificId creator_id, |
| 92 const std::string& url, | 92 mojo::URLRequestPtr request, |
| 93 const ViewId& view_id, | 93 const ViewId& view_id, |
| 94 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 94 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 95 mojo::ServiceProviderPtr exposed_services); | 95 mojo::ServiceProviderPtr exposed_services); |
| 96 void EmbedAtView(mojo::ConnectionSpecificId creator_id, | 96 void EmbedAtView(mojo::ConnectionSpecificId creator_id, |
| 97 const ViewId& view_id, | 97 const ViewId& view_id, |
| 98 mojo::ViewManagerClientPtr client); | 98 mojo::ViewManagerClientPtr client); |
| 99 | 99 |
| 100 // Returns the connection by id. | 100 // Returns the connection by id. |
| 101 ViewManagerServiceImpl* GetConnection( | 101 ViewManagerServiceImpl* GetConnection( |
| 102 mojo::ConnectionSpecificId connection_id); | 102 mojo::ConnectionSpecificId connection_id); |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 scoped_ptr<FocusController> focus_controller_; | 272 scoped_ptr<FocusController> focus_controller_; |
| 273 | 273 |
| 274 mojo::ViewManagerRootClientPtr view_manager_root_client_; | 274 mojo::ViewManagerRootClientPtr view_manager_root_client_; |
| 275 | 275 |
| 276 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 276 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
| 277 }; | 277 }; |
| 278 | 278 |
| 279 } // namespace view_manager | 279 } // namespace view_manager |
| 280 | 280 |
| 281 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 281 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
| OLD | NEW |