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

Side by Side Diff: chrome/common/chrome_paths.h

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 unified diff | Download patch
« no previous file with comments | « chrome/app/nacl_fork_delegate_linux.cc ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_COMMON_CHROME_PATHS_H__ 5 #ifndef CHROME_COMMON_CHROME_PATHS_H__
6 #define CHROME_COMMON_CHROME_PATHS_H__ 6 #define CHROME_COMMON_CHROME_PATHS_H__
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 // This file declares path keys for the chrome module. These can be used with 10 // This file declares path keys for the chrome module. These can be used with
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 FILE_RECORDED_SCRIPT, // Full path to the script.log file that 71 FILE_RECORDED_SCRIPT, // Full path to the script.log file that
72 // contains recorded browser events for 72 // contains recorded browser events for
73 // playback. 73 // playback.
74 FILE_FLASH_PLUGIN, // Full path to the internal NPAPI Flash plugin 74 FILE_FLASH_PLUGIN, // Full path to the internal NPAPI Flash plugin
75 // file. Querying this path will succeed no 75 // file. Querying this path will succeed no
76 // matter the file exists or not. 76 // matter the file exists or not.
77 FILE_PEPPER_FLASH_PLUGIN, // Full path to the bundled Pepper Flash plugin 77 FILE_PEPPER_FLASH_PLUGIN, // Full path to the bundled Pepper Flash plugin
78 // file. 78 // file.
79 FILE_PDF_PLUGIN, // Full path to the internal PDF plugin file. 79 FILE_PDF_PLUGIN, // Full path to the internal PDF plugin file.
80 80
81 #if defined(OS_POSIX) && !defined(OS_MACOSX)
82 FILE_NACL_HELPER, // Full path to Linux nacl_helper executable.
83 FILE_NACL_HELPER_BOOTSTRAP, // ... and nacl_helper_bootstrap executable.
84 #endif
85 FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file. 81 FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file.
86 DIR_PNACL_BASE, // Full path to the base dir for PNaCl. 82 DIR_PNACL_BASE, // Full path to the base dir for PNaCl.
87 DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version 83 DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version
88 // (subdir of DIR_PNACL_BASE). 84 // (subdir of DIR_PNACL_BASE).
89 FILE_O3D_PLUGIN, // Full path to the O3D Pepper plugin file. 85 FILE_O3D_PLUGIN, // Full path to the O3D Pepper plugin file.
90 FILE_O1D_PLUGIN, // Full path to the O1D Pepper plugin file. 86 FILE_O1D_PLUGIN, // Full path to the O1D Pepper plugin file.
91 FILE_GTALK_PLUGIN, // Full path to the GTalk Pepper plugin file. 87 FILE_GTALK_PLUGIN, // Full path to the GTalk Pepper plugin file.
92 DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated 88 DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated
93 // Widevine CDM files. 89 // Widevine CDM files.
94 FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file. 90 FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file.
(...skipping 22 matching lines...) Expand all
117 113
118 PATH_END 114 PATH_END
119 }; 115 };
120 116
121 // Call once to register the provider for the path keys defined above. 117 // Call once to register the provider for the path keys defined above.
122 void RegisterPathProvider(); 118 void RegisterPathProvider();
123 119
124 } // namespace chrome 120 } // namespace chrome
125 121
126 #endif // CHROME_COMMON_CHROME_PATHS_H__ 122 #endif // CHROME_COMMON_CHROME_PATHS_H__
OLDNEW
« no previous file with comments | « chrome/app/nacl_fork_delegate_linux.cc ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698