Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: mojo/runner/host/child_process_host.cc

Issue 1435063002: Eliminate third_party/mojo/src from all targets' include paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/runner/host/child_process.cc ('k') | mojo/runner/host/native_application_support.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/process/kill.h" 13 #include "base/process/kill.h"
14 #include "base/process/launch.h" 14 #include "base/process/launch.h"
15 #include "base/task_runner.h" 15 #include "base/task_runner.h"
16 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
17 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
18 #include "mojo/public/cpp/system/core.h"
19 #include "mojo/runner/host/switches.h" 17 #include "mojo/runner/host/switches.h"
20 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" 18 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
19 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h"
20 #include "third_party/mojo/src/mojo/public/cpp/system/core.h"
21 21
22 #if defined(OS_LINUX) && !defined(OS_ANDROID) 22 #if defined(OS_LINUX) && !defined(OS_ANDROID)
23 #include "sandbox/linux/services/namespace_sandbox.h" 23 #include "sandbox/linux/services/namespace_sandbox.h"
24 #endif 24 #endif
25 25
26 namespace mojo { 26 namespace mojo {
27 namespace runner { 27 namespace runner {
28 28
29 ChildProcessHost::ChildProcessHost(base::TaskRunner* launch_process_runner, 29 ChildProcessHost::ChildProcessHost(base::TaskRunner* launch_process_runner,
30 bool start_sandboxed, 30 bool start_sandboxed,
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) { 177 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) {
178 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()"; 178 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
179 179
180 DCHECK(channel_info || 180 DCHECK(channel_info ||
181 base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")); 181 base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk"));
182 channel_info_ = channel_info; 182 channel_info_ = channel_info;
183 } 183 }
184 184
185 } // namespace runner 185 } // namespace runner
186 } // namespace mojo 186 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/runner/host/child_process.cc ('k') | mojo/runner/host/native_application_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698