| 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 return; | 523 return; |
| 524 } | 524 } |
| 525 | 525 |
| 526 // Create the manifest service handle as well. | 526 // Create the manifest service handle as well. |
| 527 if (IsValidChannelHandle(launch_result.manifest_service_ipc_channel_handle)) { | 527 if (IsValidChannelHandle(launch_result.manifest_service_ipc_channel_handle)) { |
| 528 scoped_ptr<ManifestServiceChannel> manifest_service_channel( | 528 scoped_ptr<ManifestServiceChannel> manifest_service_channel( |
| 529 new ManifestServiceChannel( | 529 new ManifestServiceChannel( |
| 530 launch_result.manifest_service_ipc_channel_handle, | 530 launch_result.manifest_service_ipc_channel_handle, |
| 531 base::Bind(&PostPPCompletionCallback, callback), | 531 base::Bind(&PostPPCompletionCallback, callback), |
| 532 manifest_service_proxy.Pass(), | 532 manifest_service_proxy.Pass(), |
| 533 content::RenderThread::Get()->GetShutdownEvent())); | 533 content::RenderThread::Get()->GetShutdownEvent(), |
| 534 content::RenderThread::Get()->GetAttachmentBroker())); |
| 534 load_manager->set_manifest_service_channel( | 535 load_manager->set_manifest_service_channel( |
| 535 manifest_service_channel.Pass()); | 536 manifest_service_channel.Pass()); |
| 536 } | 537 } |
| 537 } | 538 } |
| 538 | 539 |
| 539 PP_Bool StartPpapiProxy(PP_Instance instance) { | 540 PP_Bool StartPpapiProxy(PP_Instance instance) { |
| 540 NexeLoadManager* load_manager = GetNexeLoadManager(instance); | 541 NexeLoadManager* load_manager = GetNexeLoadManager(instance); |
| 541 DCHECK(load_manager); | 542 DCHECK(load_manager); |
| 542 if (!load_manager) | 543 if (!load_manager) |
| 543 return PP_FALSE; | 544 return PP_FALSE; |
| (...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1707 &StreamPexe | 1708 &StreamPexe |
| 1708 }; | 1709 }; |
| 1709 | 1710 |
| 1710 } // namespace | 1711 } // namespace |
| 1711 | 1712 |
| 1712 const PPB_NaCl_Private* GetNaClPrivateInterface() { | 1713 const PPB_NaCl_Private* GetNaClPrivateInterface() { |
| 1713 return &nacl_interface; | 1714 return &nacl_interface; |
| 1714 } | 1715 } |
| 1715 | 1716 |
| 1716 } // namespace nacl | 1717 } // namespace nacl |
| OLD | NEW |