summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/plugin_list.h
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-06 00:47:30 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-06 00:47:30 +0000
commit338472af8c0b4ef1cf6257a7882a17cbee84a122 (patch)
tree4e4ac3d648b6727b90813830752e17b0f112269e /webkit/glue/plugins/plugin_list.h
parent4956cfbdd0cda5969acd391c3fe10486bf659488 (diff)
downloadchromium_src-338472af8c0b4ef1cf6257a7882a17cbee84a122.zip
chromium_src-338472af8c0b4ef1cf6257a7882a17cbee84a122.tar.gz
chromium_src-338472af8c0b4ef1cf6257a7882a17cbee84a122.tar.bz2
Rollback 1806, requested by Ojan.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/plugin_list.h')
-rw-r--r--webkit/glue/plugins/plugin_list.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h
index 1eac95a..6807a5f 100644
--- a/webkit/glue/plugins/plugin_list.h
+++ b/webkit/glue/plugins/plugin_list.h
@@ -151,11 +151,9 @@ class PluginList : public base::RefCounted<PluginList> {
// Hardcoded logic to detect and load Java plugins
void LoadJavaPlugin();
-#if defined(OS_WIN)
// Search the registry at the given path and load plugins listed there.
void LoadPluginsInRegistryFolder(HKEY root_key,
const std::wstring& registry_folder);
-#endif
// true if we shouldn't load the new WMP plugin.
bool dont_load_new_wmp_;