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 "build/build_config.h" |
9 #include "components/mus/common/args.h" | 9 #include "components/mus/common/args.h" |
10 #include "components/mus/gles2/gpu_impl.h" | 10 #include "components/mus/gles2/gpu_impl.h" |
11 #include "components/mus/surfaces/surfaces_scheduler.h" | 11 #include "components/mus/surfaces/surfaces_scheduler.h" |
12 #include "components/mus/ws/client_connection.h" | 12 #include "components/mus/ws/client_connection.h" |
13 #include "components/mus/ws/connection_manager.h" | 13 #include "components/mus/ws/connection_manager.h" |
14 #include "components/mus/ws/forwarding_window_manager.h" | 14 #include "components/mus/ws/forwarding_window_manager.h" |
15 #include "components/mus/ws/window_tree_host_connection.h" | 15 #include "components/mus/ws/window_tree_host_connection.h" |
16 #include "components/mus/ws/window_tree_host_impl.h" | 16 #include "components/mus/ws/window_tree_host_impl.h" |
17 #include "components/mus/ws/window_tree_impl.h" | 17 #include "components/mus/ws/window_tree_impl.h" |
18 #include "mojo/application/public/cpp/application_connection.h" | |
19 #include "mojo/application/public/cpp/application_impl.h" | |
20 #include "mojo/application/public/cpp/application_runner.h" | |
21 #include "mojo/public/c/system/main.h" | 18 #include "mojo/public/c/system/main.h" |
22 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 19 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 20 #include "mojo/shell/public/cpp/application_connection.h" |
| 21 #include "mojo/shell/public/cpp/application_impl.h" |
| 22 #include "mojo/shell/public/cpp/application_runner.h" |
23 #include "ui/events/event_switches.h" | 23 #include "ui/events/event_switches.h" |
24 #include "ui/events/platform/platform_event_source.h" | 24 #include "ui/events/platform/platform_event_source.h" |
25 #include "ui/gl/gl_surface.h" | 25 #include "ui/gl/gl_surface.h" |
26 | 26 |
27 #if defined(USE_X11) | 27 #if defined(USE_X11) |
28 #include <X11/Xlib.h> | 28 #include <X11/Xlib.h> |
29 #include "base/command_line.h" | 29 #include "base/command_line.h" |
30 #include "ui/platform_window/x11/x11_window.h" | 30 #include "ui/platform_window/x11/x11_window.h" |
31 #elif defined(USE_OZONE) | 31 #elif defined(USE_OZONE) |
32 #include "ui/ozone/public/ozone_platform.h" | 32 #include "ui/ozone/public/ozone_platform.h" |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 std::move(host_client), connection_manager_.get(), app_impl_, gpu_state_, | 159 std::move(host_client), connection_manager_.get(), app_impl_, gpu_state_, |
160 surfaces_state_, std::move(window_manager)); | 160 surfaces_state_, std::move(window_manager)); |
161 | 161 |
162 // WindowTreeHostConnection manages its own lifetime. | 162 // WindowTreeHostConnection manages its own lifetime. |
163 host_impl->Init(new ws::WindowTreeHostConnectionImpl( | 163 host_impl->Init(new ws::WindowTreeHostConnectionImpl( |
164 std::move(host), make_scoped_ptr(host_impl), std::move(tree_client), | 164 std::move(host), make_scoped_ptr(host_impl), std::move(tree_client), |
165 connection_manager_.get())); | 165 connection_manager_.get())); |
166 } | 166 } |
167 | 167 |
168 } // namespace mus | 168 } // namespace mus |
OLD | NEW |