| 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 SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 5 #ifndef SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
| 6 #define SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 6 #define SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 // Invoked when a ViewManagerServiceImpl's connection encounters an error. | 75 // Invoked when a ViewManagerServiceImpl's connection encounters an error. |
| 76 void OnConnectionError(ClientConnection* connection); | 76 void OnConnectionError(ClientConnection* connection); |
| 77 | 77 |
| 78 // See description of ViewManagerService::Embed() for details. This assumes | 78 // See description of ViewManagerService::Embed() for details. This assumes |
| 79 // |transport_view_id| is valid. | 79 // |transport_view_id| is valid. |
| 80 void EmbedAtView(mojo::ConnectionSpecificId creator_id, | 80 void EmbedAtView(mojo::ConnectionSpecificId creator_id, |
| 81 const std::string& url, | 81 const std::string& url, |
| 82 const ViewId& view_id, | 82 const ViewId& view_id, |
| 83 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 83 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 84 mojo::ServiceProviderPtr exposed_services); | 84 mojo::ServiceProviderPtr exposed_services); |
| 85 void EmbedAtView(mojo::ConnectionSpecificId creator_id, |
| 86 const ViewId& view_id, |
| 87 mojo::ViewManagerClientPtr client); |
| 85 | 88 |
| 86 // Returns the connection by id. | 89 // Returns the connection by id. |
| 87 ViewManagerServiceImpl* GetConnection( | 90 ViewManagerServiceImpl* GetConnection( |
| 88 mojo::ConnectionSpecificId connection_id); | 91 mojo::ConnectionSpecificId connection_id); |
| 89 | 92 |
| 90 // Returns the View identified by |id|. | 93 // Returns the View identified by |id|. |
| 91 ServerView* GetView(const ViewId& id); | 94 ServerView* GetView(const ViewId& id); |
| 92 | 95 |
| 93 ServerView* root() { return root_.get(); } | 96 ServerView* root() { return root_.get(); } |
| 94 DisplayManager* display_manager() { return display_manager_.get(); } | 97 DisplayManager* display_manager() { return display_manager_.get(); } |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 base::RepeatingTimer<ConnectionManager> animation_timer_; | 230 base::RepeatingTimer<ConnectionManager> animation_timer_; |
| 228 | 231 |
| 229 AnimationRunner animation_runner_; | 232 AnimationRunner animation_runner_; |
| 230 | 233 |
| 231 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 234 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
| 232 }; | 235 }; |
| 233 | 236 |
| 234 } // namespace view_manager | 237 } // namespace view_manager |
| 235 | 238 |
| 236 #endif // SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 239 #endif // SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
| OLD | NEW |