Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: ppapi/native_client/src/trusted/plugin/plugin.cc

Issue 8525014: Get all the resources relative to a single base. Currently the same base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/trusted/plugin/plugin.cc
===================================================================
--- ppapi/native_client/src/trusted/plugin/plugin.cc (revision 109525)
+++ ppapi/native_client/src/trusted/plugin/plugin.cc (working copy)
@@ -1607,20 +1607,11 @@
// Inform JavaScript that we found a nexe URL to load.
EnqueueProgressEvent(kProgressEventProgress);
if (is_portable) {
- // TODO(jvoung): Do we want to check an ENV var if pnacl is enabled first?
- nacl::string llc_url;
- nacl::string ld_url;
- if (SelectLLCURLFromManifest(&llc_url, &error_info) &&
jvoung - send to chromium... 2011/11/11 00:40:57 Should SelectLLCURLFromManifest (and for LD) be re
sehr (please use chromium) 2011/11/11 01:01:18 Duh. Of course I should have. Done.
- SelectLDURLFromManifest(&ld_url, &error_info)) {
- pp::CompletionCallback translate_callback =
- callback_factory_.NewCallback(&Plugin::BitcodeDidTranslate);
- // Will always call the callback on success or failure.
- pnacl_.BitcodeToNative(program_url,
- llc_url,
- ld_url,
- translate_callback);
- return;
- }
+ pp::CompletionCallback translate_callback =
+ callback_factory_.NewCallback(&Plugin::BitcodeDidTranslate);
+ // Will always call the callback on success or failure.
+ pnacl_.BitcodeToNative(program_url, translate_callback);
+ return;
} else {
pp::CompletionCallback open_callback =
callback_factory_.NewRequiredCallback(&Plugin::NexeFileDidOpen);

Powered by Google App Engine
This is Rietveld 408576698