diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 19:02:21 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 19:02:21 +0000 |
| commit | 9b8b6fddfef6ce2c00b0115f90a03b31c6b97645 (patch) | |
| tree | 341b15c00bf63b5c8229f3856230269b227500be /chrome | |
| parent | 4bda39710e4b3b88563b0d25b48fb8118df4d745 (diff) | |
| download | chromium_src-9b8b6fddfef6ce2c00b0115f90a03b31c6b97645.zip chromium_src-9b8b6fddfef6ce2c00b0115f90a03b31c6b97645.tar.gz chromium_src-9b8b6fddfef6ce2c00b0115f90a03b31c6b97645.tar.bz2 | |
Add path for NaCl pepper2 based plugin.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=933
TEST=none
Original patch by Noel Allen.
Review URL: http://codereview.chromium.org/5740007/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_main.cc | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.cc | 12 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.h | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index e19f550..2801b5b 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -875,6 +875,7 @@ int ChromeMain(int argc, char** argv) { if (process_type == switches::kRendererProcess || process_type == switches::kExtensionProcess || process_type == switches::kNaClLoaderProcess || + process_type == switches::kPpapiPluginProcess || process_type == switches::kGpuProcess) { initialize_sandbox = false; } diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 181cf0a..1b8e612 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -239,6 +239,18 @@ bool PathProvider(int key, FilePath* result) { cur = cur.Append(FILE_PATH_LITERAL("libpdf.so")); #endif break; + case chrome::FILE_NACL_PLUGIN: + if (!GetInternalPluginsDirectory(&cur)) + return false; +#if defined(OS_WIN) + cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll")); +#elif defined(OS_MACOSX) + // TODO(noelallen) Please verify this extention name is correct. + cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin")); +#else // Linux and Chrome OS + cur = cur.Append(FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so")); +#endif + break; case chrome::FILE_RESOURCES_PACK: #if defined(OS_MACOSX) if (mac_util::AmIBundled()) { diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 63037c6..21867bd 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -57,6 +57,7 @@ enum { FILE_GEARS_PLUGIN, // Full path to the gears.dll plugin file. FILE_FLASH_PLUGIN, // Full path to the internal Flash plugin file. FILE_PDF_PLUGIN, // Full path to the internal PDF plugin file. + FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file. FILE_LIBAVCODEC, // Full path to libavcodec media decoding // library. FILE_LIBAVFORMAT, // Full path to libavformat media parsing |