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_VIEW_MANAGER_APP_H_ | 5 #ifndef SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ |
6 #define SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ | 6 #define SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "mojo/common/tracing_impl.h" | 9 #include "mojo/common/tracing_impl.h" |
10 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_delegate.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 | 37 |
38 // ConnectionManagerDelegate: | 38 // ConnectionManagerDelegate: |
39 void OnLostConnectionToWindowManager() override; | 39 void OnLostConnectionToWindowManager() override; |
40 ClientConnection* CreateClientConnectionForEmbedAtView( | 40 ClientConnection* CreateClientConnectionForEmbedAtView( |
41 ConnectionManager* connection_manager, | 41 ConnectionManager* connection_manager, |
42 mojo::InterfaceRequest<mojo::ViewManagerService> service_request, | 42 mojo::InterfaceRequest<mojo::ViewManagerService> service_request, |
43 mojo::ConnectionSpecificId creator_id, | 43 mojo::ConnectionSpecificId creator_id, |
44 const std::string& creator_url, | 44 const std::string& creator_url, |
45 const std::string& url, | 45 const std::string& url, |
46 const ViewId& root_id) override; | 46 const ViewId& root_id) override; |
| 47 ClientConnection* CreateClientConnectionForEmbedAtView( |
| 48 ConnectionManager* connection_manager, |
| 49 mojo::InterfaceRequest<mojo::ViewManagerService> service_request, |
| 50 mojo::ConnectionSpecificId creator_id, |
| 51 const std::string& creator_url, |
| 52 const ViewId& root_id, |
| 53 mojo::ViewManagerClientPtr view_manager_client) override; |
47 | 54 |
48 // mojo::InterfaceFactory<mojo::ViewManagerService>: | 55 // mojo::InterfaceFactory<mojo::ViewManagerService>: |
49 void Create( | 56 void Create( |
50 mojo::ApplicationConnection* connection, | 57 mojo::ApplicationConnection* connection, |
51 mojo::InterfaceRequest<mojo::ViewManagerService> request) override; | 58 mojo::InterfaceRequest<mojo::ViewManagerService> request) override; |
52 | 59 |
53 // mojo::InterfaceFactory<mojo::WindowManagerInternalClient>: | 60 // mojo::InterfaceFactory<mojo::WindowManagerInternalClient>: |
54 void Create(mojo::ApplicationConnection* connection, | 61 void Create(mojo::ApplicationConnection* connection, |
55 mojo::InterfaceRequest<mojo::WindowManagerInternalClient> request) | 62 mojo::InterfaceRequest<mojo::WindowManagerInternalClient> request) |
56 override; | 63 override; |
57 | 64 |
58 // ErrorHandler (for |wm_internal_| and |wm_internal_client_binding_|). | 65 // ErrorHandler (for |wm_internal_| and |wm_internal_client_binding_|). |
59 void OnConnectionError() override; | 66 void OnConnectionError() override; |
60 | 67 |
61 mojo::ApplicationConnection* wm_app_connection_; | 68 mojo::ApplicationConnection* wm_app_connection_; |
62 scoped_ptr<mojo::Binding<mojo::WindowManagerInternalClient>> | 69 scoped_ptr<mojo::Binding<mojo::WindowManagerInternalClient>> |
63 wm_internal_client_binding_; | 70 wm_internal_client_binding_; |
64 mojo::InterfaceRequest<mojo::ViewManagerClient> wm_internal_client_request_; | 71 mojo::InterfaceRequest<mojo::ViewManagerClient> wm_internal_client_request_; |
65 mojo::WindowManagerInternalPtr wm_internal_; | 72 mojo::WindowManagerInternalPtr wm_internal_; |
66 scoped_ptr<ConnectionManager> connection_manager_; | 73 scoped_ptr<ConnectionManager> connection_manager_; |
67 mojo::TracingImpl tracing_; | 74 mojo::TracingImpl tracing_; |
68 | 75 |
69 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp); | 76 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp); |
70 }; | 77 }; |
71 | 78 |
72 } // namespace view_manager | 79 } // namespace view_manager |
73 | 80 |
74 #endif // SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ | 81 #endif // SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ |
OLD | NEW |