diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 24fff4dd46030e..b705da133c5ab5 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -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; @@ -170,26 +163,6 @@ void ComputeBuiltInPlugins(std::vector* 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; diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index f58680e09665dc..b5fd5b5db70b4e 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -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 .json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ @@ -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. diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 9897c9c8fd209f..4244af607a38d1 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -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.