OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/utility/utility_thread_impl.h" | 5 #include "content/utility/utility_thread_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "content/child/blink_platform_impl.h" | 12 #include "content/child/blink_platform_impl.h" |
13 #include "content/child/child_process.h" | 13 #include "content/child/child_process.h" |
14 #include "content/common/child_process_messages.h" | 14 #include "content/common/child_process_messages.h" |
15 #include "content/common/utility_messages.h" | 15 #include "content/common/utility_messages.h" |
16 #include "content/public/common/content_switches.h" | 16 #include "content/public/common/content_switches.h" |
17 #include "content/public/utility/content_utility_client.h" | 17 #include "content/public/utility/content_utility_client.h" |
18 #include "content/utility/utility_blink_platform_impl.h" | 18 #include "content/utility/utility_blink_platform_impl.h" |
19 #include "content/utility/utility_service_factory.h" | 19 #include "content/utility/utility_service_factory.h" |
20 #include "ipc/ipc_sync_channel.h" | 20 #include "ipc/ipc_sync_channel.h" |
| 21 #include "ppapi/features/features.h" |
21 #include "services/service_manager/public/cpp/interface_registry.h" | 22 #include "services/service_manager/public/cpp/interface_registry.h" |
22 #include "third_party/WebKit/public/web/WebKit.h" | 23 #include "third_party/WebKit/public/web/WebKit.h" |
23 | 24 |
24 #if defined(OS_POSIX) && defined(ENABLE_PLUGINS) | 25 #if defined(OS_POSIX) && BUILDFLAG(ENABLE_PLUGINS) |
25 #include "base/files/file_path.h" | 26 #include "base/files/file_path.h" |
26 #include "content/common/plugin_list.h" | 27 #include "content/common/plugin_list.h" |
27 #endif | 28 #endif |
28 | 29 |
29 namespace content { | 30 namespace content { |
30 | 31 |
31 namespace { | 32 namespace { |
32 | 33 |
33 template<typename SRC, typename DEST> | 34 template<typename SRC, typename DEST> |
34 void ConvertVector(const SRC& src, DEST* dest) { | 35 void ConvertVector(const SRC& src, DEST* dest) { |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 } | 123 } |
123 | 124 |
124 void UtilityThreadImpl::BindServiceFactoryRequest( | 125 void UtilityThreadImpl::BindServiceFactoryRequest( |
125 service_manager::mojom::ServiceFactoryRequest request) { | 126 service_manager::mojom::ServiceFactoryRequest request) { |
126 DCHECK(service_factory_); | 127 DCHECK(service_factory_); |
127 service_factory_bindings_.AddBinding(service_factory_.get(), | 128 service_factory_bindings_.AddBinding(service_factory_.get(), |
128 std::move(request)); | 129 std::move(request)); |
129 } | 130 } |
130 | 131 |
131 } // namespace content | 132 } // namespace content |
OLD | NEW |