| 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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 } | 416 } |
| 417 | 417 |
| 418 // Store the crash information shared memory handle. | 418 // Store the crash information shared memory handle. |
| 419 load_manager->set_crash_info_shmem_handle( | 419 load_manager->set_crash_info_shmem_handle( |
| 420 launch_result.crash_info_shmem_handle); | 420 launch_result.crash_info_shmem_handle); |
| 421 | 421 |
| 422 // Create the trusted plugin channel. | 422 // Create the trusted plugin channel. |
| 423 if (IsValidChannelHandle(launch_result.trusted_ipc_channel_handle)) { | 423 if (IsValidChannelHandle(launch_result.trusted_ipc_channel_handle)) { |
| 424 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel( | 424 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel( |
| 425 new TrustedPluginChannel( | 425 new TrustedPluginChannel( |
| 426 launch_result.trusted_ipc_channel_handle)); | 426 launch_result.trusted_ipc_channel_handle, |
| 427 content::RenderThread::Get()->GetShutdownEvent())); |
| 427 load_manager->set_trusted_plugin_channel(trusted_plugin_channel.Pass()); | 428 load_manager->set_trusted_plugin_channel(trusted_plugin_channel.Pass()); |
| 428 } else { | 429 } else { |
| 429 PostPPCompletionCallback(callback, PP_ERROR_FAILED); | 430 PostPPCompletionCallback(callback, PP_ERROR_FAILED); |
| 430 return; | 431 return; |
| 431 } | 432 } |
| 432 | 433 |
| 433 // Create the manifest service handle as well. | 434 // Create the manifest service handle as well. |
| 434 // For security hardening, disable the IPCs for open_resource() when they | 435 // For security hardening, disable the IPCs for open_resource() when they |
| 435 // aren't needed. PNaCl doesn't expose open_resource(), and the new | 436 // aren't needed. PNaCl doesn't expose open_resource(), and the new |
| 436 // open_resource() IPCs are currently only used for Non-SFI NaCl so far, | 437 // open_resource() IPCs are currently only used for Non-SFI NaCl so far, |
| (...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1750 &StreamPexe | 1751 &StreamPexe |
| 1751 }; | 1752 }; |
| 1752 | 1753 |
| 1753 } // namespace | 1754 } // namespace |
| 1754 | 1755 |
| 1755 const PPB_NaCl_Private* GetNaClPrivateInterface() { | 1756 const PPB_NaCl_Private* GetNaClPrivateInterface() { |
| 1756 return &nacl_interface; | 1757 return &nacl_interface; |
| 1757 } | 1758 } |
| 1758 | 1759 |
| 1759 } // namespace nacl | 1760 } // namespace nacl |
| OLD | NEW |