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 #include "components/view_manager/view_manager_app.h" | 5 #include "components/view_manager/view_manager_app.h" |
6 | 6 |
7 #include "components/view_manager/client_connection.h" | 7 #include "components/view_manager/client_connection.h" |
8 #include "components/view_manager/connection_manager.h" | 8 #include "components/view_manager/connection_manager.h" |
9 #include "components/view_manager/display_manager.h" | 9 #include "components/view_manager/display_manager.h" |
10 #include "components/view_manager/view_manager_service_impl.h" | 10 #include "components/view_manager/view_manager_service_impl.h" |
11 #include "mojo/application/application_runner_chromium.h" | 11 #include "mojo/application/application_runner_chromium.h" |
| 12 #include "mojo/application/public/cpp/application_connection.h" |
| 13 #include "mojo/application/public/cpp/application_impl.h" |
12 #include "mojo/common/tracing_impl.h" | 14 #include "mojo/common/tracing_impl.h" |
13 #include "third_party/mojo/src/mojo/public/c/system/main.h" | 15 #include "third_party/mojo/src/mojo/public/c/system/main.h" |
14 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio
n.h" | |
15 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | |
16 | 16 |
17 using mojo::ApplicationConnection; | 17 using mojo::ApplicationConnection; |
18 using mojo::ApplicationImpl; | 18 using mojo::ApplicationImpl; |
19 using mojo::InterfaceRequest; | 19 using mojo::InterfaceRequest; |
20 using mojo::ViewManagerService; | 20 using mojo::ViewManagerService; |
21 using mojo::WindowManagerInternalClient; | 21 using mojo::WindowManagerInternalClient; |
22 | 22 |
23 namespace view_manager { | 23 namespace view_manager { |
24 | 24 |
25 ViewManagerApp::ViewManagerApp() | 25 ViewManagerApp::ViewManagerApp() |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 wm_internal_client_binding_->set_error_handler(this); | 127 wm_internal_client_binding_->set_error_handler(this); |
128 wm_internal_->SetViewManagerClient( | 128 wm_internal_->SetViewManagerClient( |
129 wm_internal_client_request_.PassMessagePipe()); | 129 wm_internal_client_request_.PassMessagePipe()); |
130 } | 130 } |
131 | 131 |
132 void ViewManagerApp::OnConnectionError() { | 132 void ViewManagerApp::OnConnectionError() { |
133 ApplicationImpl::Terminate(); | 133 ApplicationImpl::Terminate(); |
134 } | 134 } |
135 | 135 |
136 } // namespace view_manager | 136 } // namespace view_manager |
OLD | NEW |