diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /webkit/glue/plugins/plugin_list.cc | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'webkit/glue/plugins/plugin_list.cc')
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc index 4b3ce27..84736cb 100644 --- a/webkit/glue/plugins/plugin_list.cc +++ b/webkit/glue/plugins/plugin_list.cc @@ -24,19 +24,12 @@ namespace NPAPI { base::LazyInstance<PluginList> g_singleton(base::LINKER_INITIALIZED); -static LoadPluginsFromDiskHookFunc g_load_plugins_hook; - // static PluginList* PluginList::Singleton() { return g_singleton.Pointer(); } // static -void PluginList::SetPluginLoadHook(LoadPluginsFromDiskHookFunc hook) { - g_load_plugins_hook = hook; -} - -// static bool PluginList::DebugPluginLoading() { return CommandLine::ForCurrentProcess()->HasSwitch( switches::kDebugPluginLoading); @@ -196,9 +189,6 @@ void PluginList::LoadPlugins(bool refresh) { internal_plugins = internal_plugins_; } - if (g_load_plugins_hook) - g_load_plugins_hook(); - std::vector<WebPluginInfo> new_plugins; std::set<FilePath> visited_plugins; |