diff options
| author | hidehiko <hidehiko@chromium.org> | 2014-11-25 18:19:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-26 02:20:04 +0000 |
| commit | 9d06846f5630b901a9736cac97d0700e2299bd56 (patch) | |
| tree | 11a16cd28f8b55bbcb23f2771b369e3ec30191d1 /components/nacl/common | |
| parent | 1319517bc43b45a516cf7d67bbcac06cfff2f58a (diff) | |
| download | chromium_src-9d06846f5630b901a9736cac97d0700e2299bd56.zip chromium_src-9d06846f5630b901a9736cac97d0700e2299bd56.tar.gz chromium_src-9d06846f5630b901a9736cac97d0700e2299bd56.tar.bz2 | |
Partially revert crrev.com/741943003 for ASAN bot build failure fix.
BUG=435432
TEST=Ran trybots.
Review URL: https://codereview.chromium.org/750013002
Cr-Commit-Position: refs/heads/master@{#305759}
Diffstat (limited to 'components/nacl/common')
| -rw-r--r-- | components/nacl/common/nacl_switches.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/components/nacl/common/nacl_switches.h b/components/nacl/common/nacl_switches.h index b3bfb4c..b38bb40 100644 --- a/components/nacl/common/nacl_switches.h +++ b/components/nacl/common/nacl_switches.h @@ -9,7 +9,6 @@ namespace switches { -#if !defined(DISABLE_NACL) // All switches in alphabetical order. The switches should be documented // alongside the definition of their values in the .cc file. extern const char kDisablePnaclCrashThrottling[]; @@ -23,7 +22,6 @@ extern const char kNaClGdb[]; extern const char kNaClLoaderNonSfiProcess[]; extern const char kNaClLoaderProcess[]; extern const char kUseNaClHelperNonSfi[]; -#endif // !defined(DISABLE_NACL) } // namespace switches |