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

Unified Diff: chrome/common/chrome_paths.cc

Issue 17198013: Don't use PathService for the location of nacl_helper and nacl_helper_bootstrap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bring nacl_paths back Created 7 years, 6 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 | « chrome/common/chrome_paths.h ('k') | chrome/common/nacl_paths.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 647763a068f2331a2c72c9896dd8ee1eea59bce3..3cec5acc0417a8fc2de7e3bc35486072dccd9d01 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -65,15 +65,6 @@ const base::FilePath::CharType kInternalNaClPluginFileName[] =
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
-// File name of the nacl_helper and nacl_helper_bootstrap, Linux only.
-const base::FilePath::CharType kInternalNaClHelperFileName[] =
- FILE_PATH_LITERAL("nacl_helper");
-const base::FilePath::CharType kInternalNaClHelperBootstrapFileName[] =
- FILE_PATH_LITERAL("nacl_helper_bootstrap");
-#endif
-
-
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
const base::FilePath::CharType kO3DPluginFileName[] =
FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so");
@@ -311,16 +302,6 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
break;
#if defined(OS_POSIX) && !defined(OS_MACOSX)
- case chrome::FILE_NACL_HELPER:
- if (!PathService::Get(base::DIR_MODULE, &cur))
- return false;
- cur = cur.Append(kInternalNaClHelperFileName);
- break;
- case chrome::FILE_NACL_HELPER_BOOTSTRAP:
- if (!PathService::Get(base::DIR_MODULE, &cur))
- return false;
- cur = cur.Append(kInternalNaClHelperBootstrapFileName);
- break;
case chrome::FILE_O3D_PLUGIN:
if (!PathService::Get(base::DIR_MODULE, &cur))
return false;
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/common/nacl_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698