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

Unified Diff: chrome/common/chrome_paths.h

Issue 7669004: Revert 97040 - Reserve 1GB at the base address of linux nacl_helper for Native Client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | « no previous file | chrome/common/chrome_paths.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.h
===================================================================
--- chrome/common/chrome_paths.h (revision 97041)
+++ chrome/common/chrome_paths.h (working copy)
@@ -40,7 +40,7 @@
// using it.
DIR_INTERNAL_PLUGINS, // Directory where internal plugins reside.
DIR_MEDIA_LIBS, // Directory where the Media libraries reside.
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && defined(OS_POSIX)
DIR_POLICY_FILES, // Directory for system-wide read-only
// policy files that allow sys-admins
// to set policies for chrome. This directory
@@ -68,10 +68,6 @@
FILE_FLASH_PLUGIN, // Full path to the internal Flash plugin file.
FILE_PEPPER_FLASH_PLUGIN, // Full path to the pepper Flash plugin file.
FILE_PDF_PLUGIN, // Full path to the internal PDF plugin file.
-
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
- FILE_NACL_HELPER, // Full path to Linux nacl_helper executable.
-#endif
FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file.
FILE_LIBAVCODEC, // Full path to libavcodec media decoding
// library.
« no previous file with comments | « no previous file | chrome/common/chrome_paths.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698