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 "services/ui/service.h" | 5 #include "services/ui/service.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
13 #include "base/threading/platform_thread.h" | 13 #include "base/threading/platform_thread.h" |
14 #include "base/trace_event/trace_event.h" | 14 #include "base/trace_event/trace_event.h" |
15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
16 #include "components/discardable_memory/service/discardable_shared_memory_manage
r.h" | 16 #include "components/discardable_memory/service/discardable_shared_memory_manage
r.h" |
17 #include "mojo/public/cpp/bindings/strong_binding.h" | 17 #include "mojo/public/cpp/bindings/strong_binding.h" |
18 #include "services/catalog/public/cpp/resource_loader.h" | 18 #include "services/catalog/public/cpp/resource_loader.h" |
19 #include "services/catalog/public/interfaces/constants.mojom.h" | 19 #include "services/catalog/public/interfaces/constants.mojom.h" |
20 #include "services/service_manager/public/c/main.h" | 20 #include "services/service_manager/public/c/main.h" |
21 #include "services/service_manager/public/cpp/connection.h" | |
22 #include "services/service_manager/public/cpp/connector.h" | 21 #include "services/service_manager/public/cpp/connector.h" |
23 #include "services/service_manager/public/cpp/interface_registry.h" | 22 #include "services/service_manager/public/cpp/interface_registry.h" |
24 #include "services/service_manager/public/cpp/service_context.h" | 23 #include "services/service_manager/public/cpp/service_context.h" |
25 #include "services/tracing/public/cpp/provider.h" | 24 #include "services/tracing/public/cpp/provider.h" |
26 #include "services/ui/clipboard/clipboard_impl.h" | 25 #include "services/ui/clipboard/clipboard_impl.h" |
27 #include "services/ui/common/switches.h" | 26 #include "services/ui/common/switches.h" |
28 #include "services/ui/display/screen_manager.h" | 27 #include "services/ui/display/screen_manager.h" |
29 #include "services/ui/ime/ime_registrar_impl.h" | 28 #include "services/ui/ime/ime_registrar_impl.h" |
30 #include "services/ui/ime/ime_server_impl.h" | 29 #include "services/ui/ime/ime_server_impl.h" |
31 #include "services/ui/ws/accessibility_manager.h" | 30 #include "services/ui/ws/accessibility_manager.h" |
(...skipping 19 matching lines...) Expand all Loading... |
51 #if defined(USE_X11) | 50 #if defined(USE_X11) |
52 #include <X11/Xlib.h> | 51 #include <X11/Xlib.h> |
53 #include "ui/base/x/x11_util.h" // nogncheck | 52 #include "ui/base/x/x11_util.h" // nogncheck |
54 #include "ui/platform_window/x11/x11_window.h" | 53 #include "ui/platform_window/x11/x11_window.h" |
55 #elif defined(USE_OZONE) | 54 #elif defined(USE_OZONE) |
56 #include "ui/events/ozone/layout/keyboard_layout_engine.h" | 55 #include "ui/events/ozone/layout/keyboard_layout_engine.h" |
57 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" | 56 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" |
58 #include "ui/ozone/public/ozone_platform.h" | 57 #include "ui/ozone/public/ozone_platform.h" |
59 #endif | 58 #endif |
60 | 59 |
61 using service_manager::Connection; | |
62 using mojo::InterfaceRequest; | 60 using mojo::InterfaceRequest; |
63 using ui::mojom::WindowServerTest; | 61 using ui::mojom::WindowServerTest; |
64 using ui::mojom::WindowTreeHostFactory; | 62 using ui::mojom::WindowTreeHostFactory; |
65 | 63 |
66 namespace ui { | 64 namespace ui { |
67 | 65 |
68 namespace { | 66 namespace { |
69 | 67 |
70 const char kResourceFileStrings[] = "mus_app_resources_strings.pak"; | 68 const char kResourceFileStrings[] = "mus_app_resources_strings.pak"; |
71 const char kResourceFile100[] = "mus_app_resources_100.pak"; | 69 const char kResourceFile100[] = "mus_app_resources_100.pak"; |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 mojom::WindowServerTestRequest request) { | 369 mojom::WindowServerTestRequest request) { |
372 if (!test_config_) | 370 if (!test_config_) |
373 return; | 371 return; |
374 mojo::MakeStrongBinding( | 372 mojo::MakeStrongBinding( |
375 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), | 373 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), |
376 std::move(request)); | 374 std::move(request)); |
377 } | 375 } |
378 | 376 |
379 | 377 |
380 } // namespace ui | 378 } // namespace ui |
OLD | NEW |