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/child/child_thread_impl.h" | 5 #include "content/child/child_thread_impl.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 | 255 |
256 } // namespace | 256 } // namespace |
257 | 257 |
258 ChildThread* ChildThread::Get() { | 258 ChildThread* ChildThread::Get() { |
259 return ChildThreadImpl::current(); | 259 return ChildThreadImpl::current(); |
260 } | 260 } |
261 | 261 |
262 ChildThreadImpl::Options::Options() | 262 ChildThreadImpl::Options::Options() |
263 : channel_name(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 263 : channel_name(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
264 switches::kProcessChannelID)), | 264 switches::kProcessChannelID)), |
265 use_mojo_channel(false) { | 265 use_mojo_channel(base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 266 switches::kMojoChannelToken)) { |
266 } | 267 } |
267 | 268 |
268 ChildThreadImpl::Options::Options(const Options& other) = default; | 269 ChildThreadImpl::Options::Options(const Options& other) = default; |
269 | 270 |
270 ChildThreadImpl::Options::~Options() { | 271 ChildThreadImpl::Options::~Options() { |
271 } | 272 } |
272 | 273 |
273 ChildThreadImpl::Options::Builder::Builder() { | 274 ChildThreadImpl::Options::Builder::Builder() { |
274 } | 275 } |
275 | 276 |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
740 void ChildThreadImpl::EnsureConnected() { | 741 void ChildThreadImpl::EnsureConnected() { |
741 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; | 742 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; |
742 base::Process::Current().Terminate(0, false); | 743 base::Process::Current().Terminate(0, false); |
743 } | 744 } |
744 | 745 |
745 bool ChildThreadImpl::IsInBrowserProcess() const { | 746 bool ChildThreadImpl::IsInBrowserProcess() const { |
746 return static_cast<bool>(browser_process_io_runner_); | 747 return static_cast<bool>(browser_process_io_runner_); |
747 } | 748 } |
748 | 749 |
749 } // namespace content | 750 } // namespace content |
OLD | NEW |