diff options
Diffstat (limited to 'components')
-rw-r--r-- | components/nacl/browser/nacl_broker_service_win.cc | 3 | ||||
-rw-r--r-- | components/nacl/browser/nacl_process_host.cc | 2 | ||||
-rw-r--r-- | components/nacl/common/nacl_switches.cc | 12 | ||||
-rw-r--r-- | components/nacl/common/nacl_switches.h | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/components/nacl/browser/nacl_broker_service_win.cc b/components/nacl/browser/nacl_broker_service_win.cc index af23be1..48b83bf 100644 --- a/components/nacl/browser/nacl_broker_service_win.cc +++ b/components/nacl/browser/nacl_broker_service_win.cc @@ -95,8 +95,7 @@ void NaClBrokerService::OnDebugExceptionHandlerLaunched(int32 pid, NaClBrokerHost* NaClBrokerService::GetBrokerHost() { BrowserChildProcessHostIterator iter(PROCESS_TYPE_NACL_BROKER); while (!iter.Done()) { - NaClBrokerHost* host = static_cast<NaClBrokerHost*>( - iter.GetDelegate()); + NaClBrokerHost* host = static_cast<NaClBrokerHost*>(iter.GetDelegate()); if (!host->IsTerminating()) return host; ++iter; diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc index 565a0d5..9ffda7c 100644 --- a/components/nacl/browser/nacl_process_host.cc +++ b/components/nacl/browser/nacl_process_host.cc @@ -272,7 +272,7 @@ NaClProcessHost::~NaClProcessHost() { base::StringPrintf("NaCl process exited with status %i (0x%x)", exit_code, exit_code); if (exit_code == 0) { - VLOG(1) << message; + LOG(INFO) << message; } else { LOG(ERROR) << message; } diff --git a/components/nacl/common/nacl_switches.cc b/components/nacl/common/nacl_switches.cc index 928b214..bb99530 100644 --- a/components/nacl/common/nacl_switches.cc +++ b/components/nacl/common/nacl_switches.cc @@ -6,6 +6,12 @@ namespace switches { +// Disables crash throttling for Portable Native Client. +const char kDisablePnaclCrashThrottling[] = "disable-pnacl-crash-throttling"; + +// Disables the installation of Portable Native Client. +const char kDisablePnaclInstall[] = "disable-pnacl-install"; + // Enables debugging via RSP over a socket. const char kEnableNaClDebug[] = "enable-nacl-debug"; @@ -36,10 +42,4 @@ const char kNaClLoaderCmdPrefix[] = "nacl-loader-cmd-prefix"; // Causes the process to run as a NativeClient loader. const char kNaClLoaderProcess[] = "nacl-loader"; -// Disables crash throttling for Portable Native Client. -const char kDisablePnaclCrashThrottling[] = "disable-pnacl-crash-throttling"; - -// Disables the installation of Portable Native Client. -const char kDisablePnaclInstall[] = "disable-pnacl-install"; - } // namespace switches diff --git a/components/nacl/common/nacl_switches.h b/components/nacl/common/nacl_switches.h index 8791d47..f0f4f4f 100644 --- a/components/nacl/common/nacl_switches.h +++ b/components/nacl/common/nacl_switches.h @@ -11,6 +11,8 @@ namespace switches { // All switches in alphabetical order. The switches should be documented // alongside the definition of their values in the .cc file. +extern const char kDisablePnaclCrashThrottling[]; +extern const char kDisablePnaclInstall[]; extern const char kEnableNaClDebug[]; extern const char kNaClBrokerProcess[]; extern const char kNaClDebugMask[]; @@ -18,8 +20,6 @@ extern const char kNaClGdb[]; extern const char kNaClGdbScript[]; extern const char kNaClLoaderCmdPrefix[]; extern const char kNaClLoaderProcess[]; -extern const char kDisablePnaclCrashThrottling[]; -extern const char kDisablePnaclInstall[]; } // namespace switches |