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 "build/build_config.h" | 14 #include "build/build_config.h" |
15 #include "mojo/public/c/system/main.h" | |
16 #include "services/catalog/public/cpp/resource_loader.h" | 15 #include "services/catalog/public/cpp/resource_loader.h" |
| 16 #include "services/shell/public/c/main.h" |
17 #include "services/shell/public/cpp/connection.h" | 17 #include "services/shell/public/cpp/connection.h" |
18 #include "services/shell/public/cpp/connector.h" | 18 #include "services/shell/public/cpp/connector.h" |
19 #include "services/tracing/public/cpp/tracing_impl.h" | 19 #include "services/tracing/public/cpp/tracing_impl.h" |
20 #include "services/ui/clipboard/clipboard_impl.h" | 20 #include "services/ui/clipboard/clipboard_impl.h" |
21 #include "services/ui/common/switches.h" | 21 #include "services/ui/common/switches.h" |
22 #include "services/ui/display/platform_screen.h" | 22 #include "services/ui/display/platform_screen.h" |
23 #include "services/ui/gles2/gpu_impl.h" | 23 #include "services/ui/gles2/gpu_impl.h" |
24 #include "services/ui/gpu/gpu_service_impl.h" | 24 #include "services/ui/gpu/gpu_service_impl.h" |
25 #include "services/ui/gpu/gpu_service_mus.h" | 25 #include "services/ui/gpu/gpu_service_mus.h" |
26 #include "services/ui/ws/accessibility_manager.h" | 26 #include "services/ui/ws/accessibility_manager.h" |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 // Display manages its own lifetime. | 389 // Display manages its own lifetime. |
390 ws::Display* host_impl = | 390 ws::Display* host_impl = |
391 new ws::Display(window_server_.get(), platform_display_init_params_); | 391 new ws::Display(window_server_.get(), platform_display_init_params_); |
392 host_impl->Init(nullptr); | 392 host_impl->Init(nullptr); |
393 | 393 |
394 if (touch_controller_) | 394 if (touch_controller_) |
395 touch_controller_->UpdateTouchTransforms(); | 395 touch_controller_->UpdateTouchTransforms(); |
396 } | 396 } |
397 | 397 |
398 } // namespace ui | 398 } // namespace ui |
OLD | NEW |