diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 16:50:07 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 16:50:07 +0000 |
| commit | ae3ec240a09e84a3760c452cd594132cc26de955 (patch) | |
| tree | fdaad4bdd125b9d38376dbed64fc2b0b13e8ffdb /webkit/glue/plugins | |
| parent | edd909b4e2e3869676b4a1720088803065a63653 (diff) | |
| download | chromium_src-ae3ec240a09e84a3760c452cd594132cc26de955.zip chromium_src-ae3ec240a09e84a3760c452cd594132cc26de955.tar.gz chromium_src-ae3ec240a09e84a3760c452cd594132cc26de955.tar.bz2 | |
Rollback the rollback of r1806. Wasn't the cause of the test failure.
Review URL: http://codereview.chromium.org/272
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
| -rw-r--r-- | webkit/glue/plugins/plugin_list.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h index 6807a5f..1eac95a 100644 --- a/webkit/glue/plugins/plugin_list.h +++ b/webkit/glue/plugins/plugin_list.h @@ -151,9 +151,11 @@ 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_; |