| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/nacl/renderer/ppb_nacl_private_impl.h" | 5 #include "components/nacl/renderer/ppb_nacl_private_impl.h" |
| 6 | 6 |
| 7 #include <numeric> | 7 #include <numeric> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 } | 494 } |
| 495 | 495 |
| 496 *(static_cast<NaClHandle*>(imc_handle)) = ToNativeHandle(result_socket); | 496 *(static_cast<NaClHandle*>(imc_handle)) = ToNativeHandle(result_socket); |
| 497 | 497 |
| 498 // Store the crash information shared memory handle. | 498 // Store the crash information shared memory handle. |
| 499 load_manager->set_crash_info_shmem_handle( | 499 load_manager->set_crash_info_shmem_handle( |
| 500 launch_result.crash_info_shmem_handle); | 500 launch_result.crash_info_shmem_handle); |
| 501 | 501 |
| 502 // Create the trusted plugin channel. | 502 // Create the trusted plugin channel. |
| 503 if (IsValidChannelHandle(launch_result.trusted_ipc_channel_handle)) { | 503 if (IsValidChannelHandle(launch_result.trusted_ipc_channel_handle)) { |
| 504 bool report_exit_status = PP_ToBool(main_service_runtime); | |
| 505 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel( | 504 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel( |
| 506 new TrustedPluginChannel( | 505 new TrustedPluginChannel( |
| 507 load_manager, | 506 load_manager, |
| 508 launch_result.trusted_ipc_channel_handle, | 507 launch_result.trusted_ipc_channel_handle, |
| 509 content::RenderThread::Get()->GetShutdownEvent(), | 508 content::RenderThread::Get()->GetShutdownEvent(), |
| 510 report_exit_status)); | 509 PP_ToBool(main_service_runtime))); |
| 511 load_manager->set_trusted_plugin_channel(trusted_plugin_channel.Pass()); | 510 load_manager->set_trusted_plugin_channel(trusted_plugin_channel.Pass()); |
| 512 } else { | 511 } else { |
| 513 PostPPCompletionCallback(callback, PP_ERROR_FAILED); | 512 PostPPCompletionCallback(callback, PP_ERROR_FAILED); |
| 514 return; | 513 return; |
| 515 } | 514 } |
| 516 | 515 |
| 517 // Create the manifest service handle as well. | 516 // Create the manifest service handle as well. |
| 518 if (IsValidChannelHandle(launch_result.manifest_service_ipc_channel_handle)) { | 517 if (IsValidChannelHandle(launch_result.manifest_service_ipc_channel_handle)) { |
| 519 scoped_ptr<ManifestServiceChannel> manifest_service_channel( | 518 scoped_ptr<ManifestServiceChannel> manifest_service_channel( |
| 520 new ManifestServiceChannel( | 519 new ManifestServiceChannel( |
| (...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1727 &StreamPexe | 1726 &StreamPexe |
| 1728 }; | 1727 }; |
| 1729 | 1728 |
| 1730 } // namespace | 1729 } // namespace |
| 1731 | 1730 |
| 1732 const PPB_NaCl_Private* GetNaClPrivateInterface() { | 1731 const PPB_NaCl_Private* GetNaClPrivateInterface() { |
| 1733 return &nacl_interface; | 1732 return &nacl_interface; |
| 1734 } | 1733 } |
| 1735 | 1734 |
| 1736 } // namespace nacl | 1735 } // namespace nacl |
| OLD | NEW |