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" | |
12 #include "mojo/application/public/cpp/application_connection.h" | 11 #include "mojo/application/public/cpp/application_connection.h" |
13 #include "mojo/application/public/cpp/application_impl.h" | 12 #include "mojo/application/public/cpp/application_impl.h" |
| 13 #include "mojo/application/public/cpp/application_runner.h" |
14 #include "mojo/common/tracing_impl.h" | 14 #include "mojo/common/tracing_impl.h" |
15 #include "third_party/mojo/src/mojo/public/c/system/main.h" | 15 #include "third_party/mojo/src/mojo/public/c/system/main.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::ViewManagerRoot; | 20 using mojo::ViewManagerRoot; |
21 using mojo::ViewManagerService; | 21 using mojo::ViewManagerService; |
22 | 22 |
23 namespace view_manager { | 23 namespace view_manager { |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 view_manager_root_binding_.reset(new mojo::Binding<ViewManagerRoot>( | 119 view_manager_root_binding_.reset(new mojo::Binding<ViewManagerRoot>( |
120 connection_manager_.get(), request.Pass())); | 120 connection_manager_.get(), request.Pass())); |
121 view_manager_root_binding_->set_error_handler(this); | 121 view_manager_root_binding_->set_error_handler(this); |
122 } | 122 } |
123 | 123 |
124 void ViewManagerApp::OnConnectionError() { | 124 void ViewManagerApp::OnConnectionError() { |
125 ApplicationImpl::Terminate(); | 125 ApplicationImpl::Terminate(); |
126 } | 126 } |
127 | 127 |
128 } // namespace view_manager | 128 } // namespace view_manager |
OLD | NEW |