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/browser/utility_process_host_impl.h" | 5 #include "content/browser/utility_process_host_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 // Let the utility process know if it is intended to be elevated. | 339 // Let the utility process know if it is intended to be elevated. |
340 if (run_elevated_) | 340 if (run_elevated_) |
341 cmd_line->AppendSwitch(switches::kUtilityProcessRunningElevated); | 341 cmd_line->AppendSwitch(switches::kUtilityProcessRunningElevated); |
342 #endif | 342 #endif |
343 | 343 |
344 process_->Launch( | 344 process_->Launch( |
345 new UtilitySandboxedProcessLauncherDelegate(exposed_dir_, | 345 new UtilitySandboxedProcessLauncherDelegate(exposed_dir_, |
346 run_elevated_, | 346 run_elevated_, |
347 no_sandbox_, env_, | 347 no_sandbox_, env_, |
348 process_->GetHost()), | 348 process_->GetHost()), |
| 349 #if defined(OS_WIN) |
| 350 NULL, |
| 351 #endif |
349 cmd_line, | 352 cmd_line, |
350 true); | 353 true); |
351 } | 354 } |
352 | 355 |
353 return true; | 356 return true; |
354 } | 357 } |
355 | 358 |
356 bool UtilityProcessHostImpl::OnMessageReceived(const IPC::Message& message) { | 359 bool UtilityProcessHostImpl::OnMessageReceived(const IPC::Message& message) { |
357 if (!client_.get()) | 360 if (!client_.get()) |
358 return true; | 361 return true; |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
401 base::WeakPtr<UtilityProcessHostImpl> host, | 404 base::WeakPtr<UtilityProcessHostImpl> host, |
402 int error_code) { | 405 int error_code) { |
403 if (!host) | 406 if (!host) |
404 return; | 407 return; |
405 | 408 |
406 host->OnProcessLaunchFailed(error_code); | 409 host->OnProcessLaunchFailed(error_code); |
407 delete host.get(); | 410 delete host.get(); |
408 } | 411 } |
409 | 412 |
410 } // namespace content | 413 } // namespace content |
OLD | NEW |