summaryrefslogtreecommitdiffstats
path: root/chrome/common/pepper_plugin_registry.h
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 23:50:46 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 23:50:46 +0000
commit3915295a2bcfd1c8f72cd5bf4c5c23fb8bc87789 (patch)
tree2f8247fdd2ac2f61593d922860e8bf1e8afc5bc8 /chrome/common/pepper_plugin_registry.h
parent7fdbbf8d47bf4c2f5d2e86e1ad68443af8cfa8ff (diff)
downloadchromium_src-3915295a2bcfd1c8f72cd5bf4c5c23fb8bc87789.zip
chromium_src-3915295a2bcfd1c8f72cd5bf4c5c23fb8bc87789.tar.gz
chromium_src-3915295a2bcfd1c8f72cd5bf4c5c23fb8bc87789.tar.bz2
Revert 50667 - Add in support for internal pepper plugins into the PepperPluginRegistry and pepper::PluginModule.
Used Chromoting's plugin as the first attempt at using this interface. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/2843018 TBR=ajwong@chromium.org Review URL: http://codereview.chromium.org/2834021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pepper_plugin_registry.h')
-rw-r--r--chrome/common/pepper_plugin_registry.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/common/pepper_plugin_registry.h b/chrome/common/pepper_plugin_registry.h
index 9949ed4..940a1ba 100644
--- a/chrome/common/pepper_plugin_registry.h
+++ b/chrome/common/pepper_plugin_registry.h
@@ -7,12 +7,11 @@
#include <string>
#include <map>
-#include <vector>
#include "webkit/glue/plugins/pepper_plugin_module.h"
struct PepperPluginInfo {
- FilePath path; // Internal plugins are of the form "internal-[name]".
+ FilePath path;
std::vector<std::string> mime_types;
};
@@ -29,14 +28,6 @@ class PepperPluginRegistry {
pepper::PluginModule* GetModule(const FilePath& path) const;
private:
- static void GetPluginInfoFromSwitch(std::vector<PepperPluginInfo>* plugins);
-
- struct InternalPluginInfo : public PepperPluginInfo {
- pepper::PluginModule::EntryPoints entry_points;
- };
- typedef std::vector<InternalPluginInfo> InternalPluginInfoList;
- static void GetInternalPluginInfo(InternalPluginInfoList* plugin_info);
-
PepperPluginRegistry();
typedef scoped_refptr<pepper::PluginModule> ModuleHandle;