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 "chrome/renderer/pepper/ppb_nacl_private_impl.h" | 5 #include "chrome/renderer/pepper/ppb_nacl_private_impl.h" |
6 | 6 |
7 #ifndef DISABLE_NACL | 7 #ifndef DISABLE_NACL |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
315 g_pnacl_resource_host.Get()->ReportTranslationFinished( | 315 g_pnacl_resource_host.Get()->ReportTranslationFinished( |
316 GetRoutingID(instance)); | 316 GetRoutingID(instance)); |
317 } | 317 } |
318 | 318 |
319 PP_Bool IsOffTheRecord() { | 319 PP_Bool IsOffTheRecord() { |
320 return PP_FromBool(ChromeRenderProcessObserver::is_incognito_process()); | 320 return PP_FromBool(ChromeRenderProcessObserver::is_incognito_process()); |
321 } | 321 } |
322 | 322 |
323 PP_Bool IsPnaclEnabled() { | 323 PP_Bool IsPnaclEnabled() { |
324 return PP_FromBool( | 324 return PP_FromBool( |
325 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePnacl)); | 325 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisablePnacl)); |
jvoung (off chromium)
2013/07/18 17:01:00
Couple of JS console debug messages get printed:
sehr
2013/07/22 23:06:50
Thanks. I didn't do an expansive enough search.
| |
326 } | 326 } |
327 | 327 |
328 PP_NaClResult ReportNaClError(PP_Instance instance, | 328 PP_NaClResult ReportNaClError(PP_Instance instance, |
329 PP_NaClError error_id) { | 329 PP_NaClError error_id) { |
330 IPC::Sender* sender = content::RenderThread::Get(); | 330 IPC::Sender* sender = content::RenderThread::Get(); |
331 | 331 |
332 if (!sender->Send( | 332 if (!sender->Send( |
333 new NaClHostMsg_NaClErrorStatus( | 333 new NaClHostMsg_NaClErrorStatus( |
334 // TODO(dschuff): does this enum need to be sent as an int, | 334 // TODO(dschuff): does this enum need to be sent as an int, |
335 // or is it safe to include the appropriate headers in | 335 // or is it safe to include the appropriate headers in |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
387 &OpenNaClExecutable | 387 &OpenNaClExecutable |
388 }; | 388 }; |
389 | 389 |
390 } // namespace | 390 } // namespace |
391 | 391 |
392 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() { | 392 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() { |
393 return &nacl_interface; | 393 return &nacl_interface; |
394 } | 394 } |
395 | 395 |
396 #endif // DISABLE_NACL | 396 #endif // DISABLE_NACL |
OLD | NEW |