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

Unified Diff: chrome/browser/nacl_process_host.cc

Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet (Closed)
Patch Set: Created 11 years, 3 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
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/browser/plugin_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/nacl_process_host.cc
diff --git a/chrome/browser/nacl_process_host.cc b/chrome/browser/nacl_process_host.cc
index 72db5615126d88deb5b2044df8c3b7f207d65b8c..bb13ab7c4428d368f33f82e0d18ab49f7230d739 100644
--- a/chrome/browser/nacl_process_host.cc
+++ b/chrome/browser/nacl_process_host.cc
@@ -39,6 +39,10 @@ NaClProcessHost::NaClProcessHost(
bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter,
const int descriptor,
nacl::FileDescriptor* handle) {
+#ifdef DISABLE_NACL
+ NOTIMPLEMENTED() << "Native Client disabled at build time";
+ return false;
+#else
nacl::Handle pair[2];
bool success = false;
// Create a connected socket
@@ -80,6 +84,7 @@ bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter,
#endif
return true;
+#endif // DISABLE_NACL
}
bool NaClProcessHost::LaunchSelLdr(ResourceMessageFilter* renderer_msg_filter,
@@ -184,4 +189,3 @@ URLRequestContext* NaClProcessHost::GetRequestContext(
const ViewHostMsg_Resource_Request& request_data) {
return NULL;
}
-
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/browser/plugin_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698