Skip to content

Commit

Permalink
Remove code to register Pepper effects plugin.
Browse files Browse the repository at this point in the history
The effects functionality has been migrated to NaCl - the code to
manually register a Pepper plugin for Effects is no longer needed.

BUG=392002
TEST=trybots, unit_tests

Review URL: https://codereview.chromium.org/1085393003

Cr-Commit-Position: refs/heads/master@{#325460}
  • Loading branch information
jhorwich authored and Commit bot committed Apr 16, 2015
1 parent 84ce239 commit a5ec7f3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 42 deletions.
27 changes: 0 additions & 27 deletions chrome/common/chrome_content_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,6 @@ const char kPDFPluginOutOfProcessMimeType[] =
const uint32 kPDFPluginPermissions = ppapi::PERMISSION_PRIVATE |
ppapi::PERMISSION_DEV;

const char kEffectsPluginName[] = "Google Talk Effects Plugin";
const char kEffectsPluginMimeType[] ="application/x-ppapi-hangouts-effects";
const char kEffectsPluginExtension[] = "";
const char kEffectsPluginDescription[] = "Google Talk Effects Plugin";
const uint32 kEffectsPluginPermissions = ppapi::PERMISSION_PRIVATE |
ppapi::PERMISSION_DEV;

content::PepperPluginInfo::GetInterfaceFunc g_pdf_get_interface;
content::PepperPluginInfo::PPP_InitializeModuleFunc g_pdf_initialize_module;
content::PepperPluginInfo::PPP_ShutdownModuleFunc g_pdf_shutdown_module;
Expand Down Expand Up @@ -170,26 +163,6 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
}
#endif // !defined(DISABLE_NACL)

// TODO(vrk): Remove this when NaCl effects plugin replaces the ppapi effects
// plugin.
static bool skip_effects_file_check = false;
if (PathService::Get(chrome::FILE_EFFECTS_PLUGIN, &path)) {
if (skip_effects_file_check || base::PathExists(path)) {
content::PepperPluginInfo effects;
effects.path = path;
effects.name = kEffectsPluginName;
effects.is_out_of_process = true;
effects.permissions = kEffectsPluginPermissions;
content::WebPluginMimeType effects_mime_type(kEffectsPluginMimeType,
kEffectsPluginExtension,
kEffectsPluginDescription);
effects.mime_types.push_back(effects_mime_type);
plugins->push_back(effects);

skip_effects_file_check = true;
}
}

#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
!defined(WIDEVINE_CDM_IS_COMPONENT)
static bool skip_widevine_cdm_file_check = false;
Expand Down
14 changes: 0 additions & 14 deletions chrome/common/chrome_paths.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,6 @@ const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] =
const base::FilePath::CharType kInternalNaClPluginFileName[] =
FILE_PATH_LITERAL("internal-nacl-plugin");

const base::FilePath::CharType kEffectsPluginFileName[] =
#if defined(OS_WIN)
FILE_PATH_LITERAL("pepper/libppeffects.dll");
#elif defined(OS_MACOSX)
FILE_PATH_LITERAL("pepper/libppeffects.plugin");
#else // Linux and Chrome OS
FILE_PATH_LITERAL("pepper/libppeffects.so");
#endif

#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/
Expand Down Expand Up @@ -316,11 +307,6 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
cur = cur.Append(chrome::kPepperFlashPluginFilename);
break;
case chrome::FILE_EFFECTS_PLUGIN:
if (!GetInternalPluginsDirectory(&cur))
return false;
cur = cur.Append(kEffectsPluginFileName);
break;
// TODO(teravest): Remove this case once the internal NaCl plugin is gone.
// We currently need a path here to look up whether the plugin is disabled
// and what its permissions are.
Expand Down
1 change: 0 additions & 1 deletion chrome/common/chrome_paths.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ enum {
DIR_PNACL_BASE, // Full path to the base dir for PNaCl.
DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version
// (subdir of DIR_PNACL_BASE).
FILE_EFFECTS_PLUGIN, // Full path to the Effects Pepper plugin file.
DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated
// Widevine CDM files.
FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file.
Expand Down

0 comments on commit a5ec7f3

Please sign in to comment.