| 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/mus/mus_app.h" | 5 #include "components/mus/mus_app.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "build/build_config.h" |
| 8 #include "components/mus/common/args.h" | 9 #include "components/mus/common/args.h" |
| 9 #include "components/mus/gles2/gpu_impl.h" | 10 #include "components/mus/gles2/gpu_impl.h" |
| 10 #include "components/mus/surfaces/surfaces_scheduler.h" | 11 #include "components/mus/surfaces/surfaces_scheduler.h" |
| 11 #include "components/mus/ws/client_connection.h" | 12 #include "components/mus/ws/client_connection.h" |
| 12 #include "components/mus/ws/connection_manager.h" | 13 #include "components/mus/ws/connection_manager.h" |
| 13 #include "components/mus/ws/forwarding_window_manager.h" | 14 #include "components/mus/ws/forwarding_window_manager.h" |
| 14 #include "components/mus/ws/window_tree_host_connection.h" | 15 #include "components/mus/ws/window_tree_host_connection.h" |
| 15 #include "components/mus/ws/window_tree_host_impl.h" | 16 #include "components/mus/ws/window_tree_host_impl.h" |
| 16 #include "components/mus/ws/window_tree_impl.h" | 17 #include "components/mus/ws/window_tree_impl.h" |
| 17 #include "mojo/application/public/cpp/application_connection.h" | 18 #include "mojo/application/public/cpp/application_connection.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 std::move(host_client), connection_manager_.get(), app_impl_, gpu_state_, | 150 std::move(host_client), connection_manager_.get(), app_impl_, gpu_state_, |
| 150 surfaces_state_, std::move(window_manager)); | 151 surfaces_state_, std::move(window_manager)); |
| 151 | 152 |
| 152 // WindowTreeHostConnection manages its own lifetime. | 153 // WindowTreeHostConnection manages its own lifetime. |
| 153 host_impl->Init(new ws::WindowTreeHostConnectionImpl( | 154 host_impl->Init(new ws::WindowTreeHostConnectionImpl( |
| 154 std::move(host), make_scoped_ptr(host_impl), std::move(tree_client), | 155 std::move(host), make_scoped_ptr(host_impl), std::move(tree_client), |
| 155 connection_manager_.get())); | 156 connection_manager_.get())); |
| 156 } | 157 } |
| 157 | 158 |
| 158 } // namespace mus | 159 } // namespace mus |
| OLD | NEW |