--- a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.h Wed Jun 23 19:07:03 2010 +0300
+++ b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.h Tue Jul 06 15:10:48 2010 +0300
@@ -45,7 +45,7 @@
typedef HashSet<RefPtr<PluginPackage>, PluginPackageHash> PluginSet;
- class PluginDatabase {
+ class PluginDatabase : public Noncopyable {
public:
PluginDatabase();
@@ -83,6 +83,8 @@
static Vector<String> defaultPluginDirectories();
Vector<String> pluginDirectories() const { return m_pluginDirectories; }
+ String MIMETypeForExtension(const String& extension) const;
+
private:
void getPluginPathsInDirectories(HashSet<String>&) const;
void getDeletedPlugins(PluginSet&) const;
@@ -91,8 +93,6 @@
bool add(PassRefPtr<PluginPackage>);
void remove(PluginPackage*);
- String MIMETypeForExtension(const String& extension) const;
-
Vector<String> m_pluginDirectories;
HashSet<String> m_registeredMIMETypes;
PluginSet m_plugins;