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/message_loop/message_loop.h" |
13 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
14 #include "base/threading/platform_thread.h" | 15 #include "base/threading/platform_thread.h" |
15 #include "base/trace_event/trace_event.h" | 16 #include "base/trace_event/trace_event.h" |
16 #include "build/build_config.h" | 17 #include "build/build_config.h" |
17 #include "components/discardable_memory/service/discardable_shared_memory_manage
r.h" | 18 #include "components/discardable_memory/service/discardable_shared_memory_manage
r.h" |
18 #include "mojo/public/cpp/bindings/strong_binding.h" | 19 #include "mojo/public/cpp/bindings/strong_binding.h" |
19 #include "services/catalog/public/cpp/resource_loader.h" | 20 #include "services/catalog/public/cpp/resource_loader.h" |
20 #include "services/catalog/public/interfaces/constants.mojom.h" | 21 #include "services/catalog/public/interfaces/constants.mojom.h" |
21 #include "services/service_manager/public/c/main.h" | 22 #include "services/service_manager/public/c/main.h" |
22 #include "services/service_manager/public/cpp/connector.h" | 23 #include "services/service_manager/public/cpp/connector.h" |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 mojom::WindowServerTestRequest request) { | 422 mojom::WindowServerTestRequest request) { |
422 if (!test_config_) | 423 if (!test_config_) |
423 return; | 424 return; |
424 mojo::MakeStrongBinding( | 425 mojo::MakeStrongBinding( |
425 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), | 426 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), |
426 std::move(request)); | 427 std::move(request)); |
427 } | 428 } |
428 | 429 |
429 | 430 |
430 } // namespace ui | 431 } // namespace ui |
OLD | NEW |