summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 03:36:53 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 03:36:53 +0000
commit969255235bd0a1324e85776e423a9a7cf2f13ccc (patch)
treeee36bf9f951f8205f2369f9dccf5c1c8d04b5570 /chrome
parent88bec0e4d832ae7fd27ad1610d5f8e4e46e3b06a (diff)
downloadchromium_src-969255235bd0a1324e85776e423a9a7cf2f13ccc.zip
chromium_src-969255235bd0a1324e85776e423a9a7cf2f13ccc.tar.gz
chromium_src-969255235bd0a1324e85776e423a9a7cf2f13ccc.tar.bz2
Don't add the pdf plugin to pepper_plugin_registry yet. This avoids it showing up twice in Linux (not sure why not on Windows).
BUG=48181 Review URL: http://codereview.chromium.org/2947010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/common/pepper_plugin_registry.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc
index c6ed963..10b0311 100644
--- a/chrome/common/pepper_plugin_registry.cc
+++ b/chrome/common/pepper_plugin_registry.cc
@@ -67,6 +67,8 @@ void PepperPluginRegistry::GetPluginInfoFromSwitch(
// static
void PepperPluginRegistry::GetExtraPlugins(
std::vector<PepperPluginInfo>* plugins) {
+ /*
+ // Pepper v2 plugin isn't ready yet.
FilePath path;
if (PathService::Get(chrome::FILE_PDF_PLUGIN, &path) &&
file_util::PathExists(path)) {
@@ -78,6 +80,7 @@ void PepperPluginRegistry::GetExtraPlugins(
pdf.type_descriptions = "Portable Document Format";
plugins->push_back(pdf);
}
+ */
}
// static