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

Side by Side Diff: chrome/renderer/pepper/ppb_nacl_private_impl.cc

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update with code review feedback. Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 return; 306 return;
307 g_pnacl_resource_host.Get()->ReportTranslationFinished(instance); 307 g_pnacl_resource_host.Get()->ReportTranslationFinished(instance);
308 } 308 }
309 309
310 PP_Bool IsOffTheRecord() { 310 PP_Bool IsOffTheRecord() {
311 return PP_FromBool(ChromeRenderProcessObserver::is_incognito_process()); 311 return PP_FromBool(ChromeRenderProcessObserver::is_incognito_process());
312 } 312 }
313 313
314 PP_Bool IsPnaclEnabled() { 314 PP_Bool IsPnaclEnabled() {
315 return PP_FromBool( 315 return PP_FromBool(
316 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePnacl)); 316 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisablePnacl));
317 } 317 }
318 318
319 PP_NaClResult ReportNaClError(PP_Instance instance, 319 PP_NaClResult ReportNaClError(PP_Instance instance,
320 PP_NaClError error_id) { 320 PP_NaClError error_id) {
321 IPC::Sender* sender = content::RenderThread::Get(); 321 IPC::Sender* sender = content::RenderThread::Get();
322 322
323 if (!sender->Send( 323 if (!sender->Send(
324 new NaClHostMsg_NaClErrorStatus( 324 new NaClHostMsg_NaClErrorStatus(
325 // TODO(dschuff): does this enum need to be sent as an int, 325 // TODO(dschuff): does this enum need to be sent as an int,
326 // or is it safe to include the appropriate headers in 326 // or is it safe to include the appropriate headers in
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 &OpenNaClExecutable 375 &OpenNaClExecutable
376 }; 376 };
377 377
378 } // namespace 378 } // namespace
379 379
380 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() { 380 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() {
381 return &nacl_interface; 381 return &nacl_interface;
382 } 382 }
383 383
384 #endif // DISABLE_NACL 384 #endif // DISABLE_NACL
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698