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 "native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" | 5 #include "native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" |
6 | 6 |
7 #include "native_client/src/trusted/plugin/nacl_entry_points.h" | 7 #include "native_client/src/trusted/plugin/nacl_entry_points.h" |
8 | 8 |
9 LaunchNaClProcessFunc launch_nacl_process = NULL; | 9 LaunchNaClProcessFunc launch_nacl_process = NULL; |
10 | 10 |
11 namespace plugin { | 11 namespace plugin { |
12 | 12 |
13 bool SelLdrLauncherChrome::Start(const char* url) { | 13 bool SelLdrLauncherChrome::Start(const char* url) { |
| 14 return Start(0, url); |
| 15 } |
| 16 |
| 17 bool SelLdrLauncherChrome::Start(PP_Instance instance, const char* url) { |
14 // send a synchronous message to the browser process | 18 // send a synchronous message to the browser process |
15 // TODO(sehr): This is asserted to be one. Remove this parameter. | 19 // TODO(sehr): This is asserted to be one. Remove this parameter. |
16 static const int kNumberOfChannelsToBeCreated = 1; | 20 static const int kNumberOfChannelsToBeCreated = 1; |
17 if (!launch_nacl_process || | 21 if (!launch_nacl_process || |
18 !launch_nacl_process(url, kNumberOfChannelsToBeCreated, &channel_)) { | 22 !launch_nacl_process(instance, |
| 23 url, |
| 24 kNumberOfChannelsToBeCreated, |
| 25 &channel_)) { |
19 return false; | 26 return false; |
20 } | 27 } |
21 return true; | 28 return true; |
22 } | 29 } |
23 | 30 |
24 } // namespace plugin | 31 } // namespace plugin |
OLD | NEW |