| 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 "components/mus/gles2/gpu_impl.h" | 8 #include "components/mus/gles2/gpu_impl.h" |
| 9 #include "components/mus/public/cpp/args.h" | 9 #include "components/mus/public/cpp/args.h" |
| 10 #include "components/mus/surfaces/surfaces_scheduler.h" | 10 #include "components/mus/surfaces/surfaces_scheduler.h" |
| 11 #include "components/mus/ws/client_connection.h" | 11 #include "components/mus/ws/client_connection.h" |
| 12 #include "components/mus/ws/connection_manager.h" | 12 #include "components/mus/ws/connection_manager.h" |
| 13 #include "components/mus/ws/window_tree_host_connection.h" | 13 #include "components/mus/ws/window_tree_host_connection.h" |
| 14 #include "components/mus/ws/window_tree_host_impl.h" | 14 #include "components/mus/ws/window_tree_host_impl.h" |
| 15 #include "components/mus/ws/window_tree_impl.h" | 15 #include "components/mus/ws/window_tree_impl.h" |
| 16 #include "mojo/application/public/cpp/application_connection.h" | 16 #include "mojo/application/public/cpp/application_connection.h" |
| 17 #include "mojo/application/public/cpp/application_impl.h" | 17 #include "mojo/application/public/cpp/application_impl.h" |
| 18 #include "mojo/application/public/cpp/application_runner.h" | 18 #include "mojo/application/public/cpp/application_runner.h" |
| 19 #include "mojo/public/c/system/main.h" |
| 19 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 20 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 20 #include "third_party/mojo/src/mojo/public/c/system/main.h" | |
| 21 #include "ui/events/event_switches.h" | 21 #include "ui/events/event_switches.h" |
| 22 #include "ui/events/platform/platform_event_source.h" | 22 #include "ui/events/platform/platform_event_source.h" |
| 23 #include "ui/gl/gl_surface.h" | 23 #include "ui/gl/gl_surface.h" |
| 24 | 24 |
| 25 #if defined(USE_X11) | 25 #if defined(USE_X11) |
| 26 #include <X11/Xlib.h> | 26 #include <X11/Xlib.h> |
| 27 #include "base/command_line.h" | 27 #include "base/command_line.h" |
| 28 #include "ui/platform_window/x11/x11_window.h" | 28 #include "ui/platform_window/x11/x11_window.h" |
| 29 #endif | 29 #endif |
| 30 | 30 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 host_client.Pass(), connection_manager_.get(), app_impl_, gpu_state_, | 121 host_client.Pass(), connection_manager_.get(), app_impl_, gpu_state_, |
| 122 surfaces_state_, window_manager.Pass()); | 122 surfaces_state_, window_manager.Pass()); |
| 123 | 123 |
| 124 // WindowTreeHostConnection manages its own lifetime. | 124 // WindowTreeHostConnection manages its own lifetime. |
| 125 host_impl->Init(new ws::WindowTreeHostConnectionImpl( | 125 host_impl->Init(new ws::WindowTreeHostConnectionImpl( |
| 126 host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(), | 126 host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(), |
| 127 connection_manager_.get())); | 127 connection_manager_.get())); |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace mus | 130 } // namespace mus |
| OLD | NEW |