diff options
| author | jhorwich <jhorwich@chromium.org> | 2015-04-07 15:01:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-07 22:02:24 +0000 |
| commit | 01d8f26f28aba73ebd4346e296b947a2b939a1fb (patch) | |
| tree | 9ca3da23530b927c222256b4fcf984c745ff01d7 /chrome/common/chrome_paths.cc | |
| parent | e3d6b757596c96fb8f59fd4d3ca24e2b282bafcb (diff) | |
| download | chromium_src-01d8f26f28aba73ebd4346e296b947a2b939a1fb.zip chromium_src-01d8f26f28aba73ebd4346e296b947a2b939a1fb.tar.gz chromium_src-01d8f26f28aba73ebd4346e296b947a2b939a1fb.tar.bz2 | |
Remove GTalk/O1D plugins and related code
This removes some special-case code used to register and load
gtbp and o1d PPAPI plugins on Linux and ChromeOS. It also removes
infrastructure used to launch these plugins.
TEST=Run PDF (out-of-process) and NaCl (in-process) plugins
BUG=392002
Review URL: https://codereview.chromium.org/374773002
Cr-Commit-Position: refs/heads/master@{#324131}
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 3cee502..f58680e 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -75,16 +75,6 @@ const base::FilePath::CharType kEffectsPluginFileName[] = FILE_PATH_LITERAL("pepper/libppeffects.so"); #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) - -const base::FilePath::CharType kO1DPluginFileName[] = - FILE_PATH_LITERAL("pepper/libppo1d.so"); - -const base::FilePath::CharType kGTalkPluginFileName[] = - FILE_PATH_LITERAL("pepper/libppgoogletalk.so"); - -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) - #if defined(OS_LINUX) // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ @@ -375,18 +365,6 @@ bool PathProvider(int key, base::FilePath* result) { #endif cur = cur.Append(FILE_PATH_LITERAL("pnacl")); break; -#if defined(OS_POSIX) && !defined(OS_MACOSX) - case chrome::FILE_O1D_PLUGIN: - if (!PathService::Get(base::DIR_MODULE, &cur)) - return false; - cur = cur.Append(kO1DPluginFileName); - break; - case chrome::FILE_GTALK_PLUGIN: - if (!PathService::Get(base::DIR_MODULE, &cur)) - return false; - cur = cur.Append(kGTalkPluginFileName); - break; -#endif #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) #if defined(WIDEVINE_CDM_IS_COMPONENT) case chrome::DIR_COMPONENT_WIDEVINE_CDM: |