| 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 "mojo/runner/host/child_process_host.h" | 5 #include "mojo/runner/host/child_process_host.h" |
| 6 | 6 |
| 7 #include <stdint.h> |
| 8 |
| 7 #include <utility> | 9 #include <utility> |
| 8 | 10 |
| 9 #include "base/bind.h" | 11 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 11 #include "base/location.h" | 13 #include "base/location.h" |
| 12 #include "base/logging.h" | 14 #include "base/logging.h" |
| 13 #include "base/macros.h" | 15 #include "base/macros.h" |
| 14 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
| 15 #include "base/process/kill.h" | 17 #include "base/process/kill.h" |
| 16 #include "base/process/launch.h" | 18 #include "base/process/launch.h" |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) { | 232 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) { |
| 231 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()"; | 233 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()"; |
| 232 | 234 |
| 233 DCHECK(channel_info || | 235 DCHECK(channel_info || |
| 234 base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")); | 236 base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")); |
| 235 channel_info_ = channel_info; | 237 channel_info_ = channel_info; |
| 236 } | 238 } |
| 237 | 239 |
| 238 } // namespace runner | 240 } // namespace runner |
| 239 } // namespace mojo | 241 } // namespace mojo |
| OLD | NEW |