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

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

Issue 235983020: Pepper: Move PnaclOptions outside trusted plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another build fix Created 6 years, 8 months 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
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index 270d71d844fc8871f78022b0b973ec3c9f4ee31d..477eb4ae8b4890f0b7661ce72fb635aef2d64a7a 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -796,7 +796,7 @@ void Plugin::ProcessNaClManifest(const nacl::string& manifest_json) {
}
nacl::string program_url;
- PnaclOptions pnacl_options;
+ PP_PNaClOptions pnacl_options;
bool uses_nonsfi_mode;
if (manifest_->GetProgramURL(
&program_url, &pnacl_options, &uses_nonsfi_mode, &error_info)) {
@@ -811,7 +811,7 @@ void Plugin::ProcessNaClManifest(const nacl::string& manifest_json) {
PP_NACL_READY_STATE_LOADING);
// Inform JavaScript that we found a nexe URL to load.
EnqueueProgressEvent(PP_NACL_EVENT_PROGRESS);
- if (pnacl_options.translate()) {
+ if (pnacl_options.translate) {
pp::CompletionCallback translate_callback =
callback_factory_.NewCallback(&Plugin::BitcodeDidTranslate);
// Will always call the callback on success or failure.

Powered by Google App Engine
This is Rietveld 408576698