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" |
(...skipping 22 matching lines...) Expand all Loading... |
33 template<typename SRC, typename DEST> | 33 template<typename SRC, typename DEST> |
34 void ConvertVector(const SRC& src, DEST* dest) { | 34 void ConvertVector(const SRC& src, DEST* dest) { |
35 dest->reserve(src.size()); | 35 dest->reserve(src.size()); |
36 for (typename SRC::const_iterator i = src.begin(); i != src.end(); ++i) | 36 for (typename SRC::const_iterator i = src.begin(); i != src.end(); ++i) |
37 dest->push_back(typename DEST::value_type(*i)); | 37 dest->push_back(typename DEST::value_type(*i)); |
38 } | 38 } |
39 | 39 |
40 } // namespace | 40 } // namespace |
41 | 41 |
42 UtilityThreadImpl::UtilityThreadImpl() | 42 UtilityThreadImpl::UtilityThreadImpl() |
43 : ChildThreadImpl(ChildThreadImpl::Options::Builder().Build()) { | 43 : ChildThreadImpl(ChildThreadImpl::Options::Builder() |
| 44 .UseMojoChannel(true).Build()) { |
44 Init(); | 45 Init(); |
45 } | 46 } |
46 | 47 |
47 UtilityThreadImpl::UtilityThreadImpl(const InProcessChildThreadParams& params) | 48 UtilityThreadImpl::UtilityThreadImpl(const InProcessChildThreadParams& params) |
48 : ChildThreadImpl(ChildThreadImpl::Options::Builder() | 49 : ChildThreadImpl(ChildThreadImpl::Options::Builder() |
49 .InBrowserProcess(params) | 50 .InBrowserProcess(params) |
50 .UseMojoChannel(true) | 51 .UseMojoChannel(true) |
51 .Build()) { | 52 .Build()) { |
52 Init(); | 53 Init(); |
53 } | 54 } |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 } | 127 } |
127 | 128 |
128 void UtilityThreadImpl::BindProcessControlRequest( | 129 void UtilityThreadImpl::BindProcessControlRequest( |
129 mojo::InterfaceRequest<mojom::ProcessControl> request) { | 130 mojo::InterfaceRequest<mojom::ProcessControl> request) { |
130 DCHECK(process_control_); | 131 DCHECK(process_control_); |
131 process_control_bindings_.AddBinding(process_control_.get(), | 132 process_control_bindings_.AddBinding(process_control_.get(), |
132 std::move(request)); | 133 std::move(request)); |
133 } | 134 } |
134 | 135 |
135 } // namespace content | 136 } // namespace content |
OLD | NEW |