| 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 <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 11 #include "base/threading/platform_thread.h" | 11 #include "base/threading/platform_thread.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "components/mus/common/args.h" | 13 #include "components/mus/common/args.h" |
| 14 #include "components/mus/gles2/gpu_impl.h" | 14 #include "components/mus/gles2/gpu_impl.h" |
| 15 #include "components/mus/ws/display.h" | 15 #include "components/mus/ws/display.h" |
| 16 #include "components/mus/ws/display_binding.h" | 16 #include "components/mus/ws/display_binding.h" |
| 17 #include "components/mus/ws/display_manager.h" | 17 #include "components/mus/ws/display_manager.h" |
| 18 #include "components/mus/ws/user_display_manager.h" | 18 #include "components/mus/ws/user_display_manager.h" |
| 19 #include "components/mus/ws/window_server.h" | 19 #include "components/mus/ws/window_server.h" |
| 20 #include "components/mus/ws/window_tree.h" | 20 #include "components/mus/ws/window_tree.h" |
| 21 #include "components/mus/ws/window_tree_binding.h" | 21 #include "components/mus/ws/window_tree_binding.h" |
| 22 #include "components/mus/ws/window_tree_factory.h" | 22 #include "components/mus/ws/window_tree_factory.h" |
| 23 #include "components/mus/ws/window_tree_host_factory.h" | 23 #include "components/mus/ws/window_tree_host_factory.h" |
| 24 #include "components/resource_provider/public/cpp/resource_loader.h" | 24 #include "components/resource_provider/public/cpp/resource_loader.h" |
| 25 #include "mojo/public/c/system/main.h" | 25 #include "mojo/public/c/system/main.h" |
| 26 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 26 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 27 #include "mojo/shell/public/cpp/connection.h" | 27 #include "services/shell/public/cpp/connection.h" |
| 28 #include "mojo/shell/public/cpp/connector.h" | 28 #include "services/shell/public/cpp/connector.h" |
| 29 #include "ui/base/resource/resource_bundle.h" | 29 #include "ui/base/resource/resource_bundle.h" |
| 30 #include "ui/base/ui_base_paths.h" | 30 #include "ui/base/ui_base_paths.h" |
| 31 #include "ui/events/event_switches.h" | 31 #include "ui/events/event_switches.h" |
| 32 #include "ui/events/platform/platform_event_source.h" | 32 #include "ui/events/platform/platform_event_source.h" |
| 33 #include "ui/gl/gl_surface.h" | 33 #include "ui/gl/gl_surface.h" |
| 34 | 34 |
| 35 #if defined(USE_X11) | 35 #if defined(USE_X11) |
| 36 #include <X11/Xlib.h> | 36 #include <X11/Xlib.h> |
| 37 #include "base/command_line.h" | 37 #include "base/command_line.h" |
| 38 #include "ui/platform_window/x11/x11_window.h" | 38 #include "ui/platform_window/x11/x11_window.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 user_state->window_tree_host_factory->AddBinding(std::move(request)); | 250 user_state->window_tree_host_factory->AddBinding(std::move(request)); |
| 251 } | 251 } |
| 252 | 252 |
| 253 void MandolineUIServicesApp::Create(mojo::Connection* connection, | 253 void MandolineUIServicesApp::Create(mojo::Connection* connection, |
| 254 mojom::GpuRequest request) { | 254 mojom::GpuRequest request) { |
| 255 DCHECK(platform_display_init_params_.gpu_state); | 255 DCHECK(platform_display_init_params_.gpu_state); |
| 256 new GpuImpl(std::move(request), platform_display_init_params_.gpu_state); | 256 new GpuImpl(std::move(request), platform_display_init_params_.gpu_state); |
| 257 } | 257 } |
| 258 | 258 |
| 259 } // namespace mus | 259 } // namespace mus |
| OLD | NEW |