diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 21:53:16 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 21:53:16 +0000 |
| commit | be13068b97a3aac41cad8a77f1b8626b29aaa934 (patch) | |
| tree | 082bc2f007d41f6c79e5675a16d5c0f914ca8643 /webkit | |
| parent | a6152af0508075b978b4f73e1bd74f0e8cd3bb7f (diff) | |
| download | chromium_src-be13068b97a3aac41cad8a77f1b8626b29aaa934.zip chromium_src-be13068b97a3aac41cad8a77f1b8626b29aaa934.tar.gz chromium_src-be13068b97a3aac41cad8a77f1b8626b29aaa934.tar.bz2 | |
ThreadRestrictions: mark library loading functions as doing IO
Remove the hack we used for checking that plugins didn't
regress, as this is a generalization of that idea.
Review URL: http://codereview.chromium.org/4161004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 10 | ||||
| -rw-r--r-- | webkit/glue/plugins/plugin_list.h | 5 |
2 files changed, 0 insertions, 15 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; diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h index 25b903b..101e6b7 100644 --- a/webkit/glue/plugins/plugin_list.h +++ b/webkit/glue/plugins/plugin_list.h @@ -63,8 +63,6 @@ struct PluginVersionInfo { PluginEntryPoints entry_points; }; -typedef void (*LoadPluginsFromDiskHookFunc)(); - // The PluginList is responsible for loading our NPAPI based plugins. It does // so in whatever manner is appropriate for the platform. On Windows, it loads // plugins from a known directory by looking for DLLs which start with "NP", @@ -78,9 +76,6 @@ class PluginList { // Gets the one instance of the PluginList. static PluginList* Singleton(); - // Set a hook that is called whenever we load plugins from the disk. - static void SetPluginLoadHook(LoadPluginsFromDiskHookFunc hook); - // Returns true if we're in debug-plugin-loading mode. This is controlled // by a command line switch. static bool DebugPluginLoading(); |