| 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 "build/build_config.h" | 15 #include "build/build_config.h" |
| 15 #include "services/catalog/public/cpp/resource_loader.h" | 16 #include "services/catalog/public/cpp/resource_loader.h" |
| 16 #include "services/shell/public/c/main.h" | 17 #include "services/shell/public/c/main.h" |
| 17 #include "services/shell/public/cpp/connection.h" | 18 #include "services/shell/public/cpp/connection.h" |
| 18 #include "services/shell/public/cpp/connector.h" | 19 #include "services/shell/public/cpp/connector.h" |
| 19 #include "services/tracing/public/cpp/provider.h" | 20 #include "services/tracing/public/cpp/provider.h" |
| 20 #include "services/ui/clipboard/clipboard_impl.h" | 21 #include "services/ui/clipboard/clipboard_impl.h" |
| 21 #include "services/ui/common/switches.h" | 22 #include "services/ui/common/switches.h" |
| 22 #include "services/ui/display/platform_screen.h" | 23 #include "services/ui/display/platform_screen.h" |
| 23 #include "services/ui/ime/ime_registrar_impl.h" | 24 #include "services/ui/ime/ime_registrar_impl.h" |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 | 349 |
| 349 void Service::Create(const shell::Identity& remote_identity, | 350 void Service::Create(const shell::Identity& remote_identity, |
| 350 mojom::WindowServerTestRequest request) { | 351 mojom::WindowServerTestRequest request) { |
| 351 if (!test_config_) | 352 if (!test_config_) |
| 352 return; | 353 return; |
| 353 new ws::WindowServerTestImpl(window_server_.get(), std::move(request)); | 354 new ws::WindowServerTestImpl(window_server_.get(), std::move(request)); |
| 354 } | 355 } |
| 355 | 356 |
| 356 | 357 |
| 357 } // namespace ui | 358 } // namespace ui |
| OLD | NEW |