diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 11:52:19 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 11:52:19 +0000 |
| commit | a799122533f9ac9df6a5e173a5d0b75bab2b7687 (patch) | |
| tree | ca72dab24a355bb31d3664e984ee6c5fed47a1eb /content/browser/plugin_service_impl.h | |
| parent | 3f9de6c3b210d5f4ee0aa1324b048c9fa1ed808c (diff) | |
| download | chromium_src-a799122533f9ac9df6a5e173a5d0b75bab2b7687.zip chromium_src-a799122533f9ac9df6a5e173a5d0b75bab2b7687.tar.gz chromium_src-a799122533f9ac9df6a5e173a5d0b75bab2b7687.tar.bz2 | |
Revert 137396 - Sequentialize calls to PluginList::GetPlugins from PluginService.
BUG=105987
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10381087
TBR=bauerb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10383210
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.h')
| -rw-r--r-- | content/browser/plugin_service_impl.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index b3fcbf9..bc8f112 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -18,7 +18,6 @@ #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" #include "base/synchronization/waitable_event_watcher.h" -#include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "build/build_config.h" #include "content/browser/plugin_process_host.h" @@ -178,11 +177,9 @@ class CONTENT_EXPORT PluginServiceImpl void RegisterPepperPlugins(); -#if defined(OS_WIN) - // Run on the blocking pool to load the plugins synchronously. + // Function that is run on the FILE thread to load the plugins synchronously. void GetPluginsInternal(base::MessageLoopProxy* target_loop, const GetPluginsCallback& callback); -#endif // Binding directly to GetAllowedPluginForOpenChannelToPlugin() isn't possible // because more arity is needed <http://crbug.com/98542>. This just forwards. @@ -243,10 +240,6 @@ class CONTENT_EXPORT PluginServiceImpl std::set<PluginProcessHost::Client*> pending_plugin_clients_; -#if defined(OS_WIN) - // Used to sequentialize loading plug-ins from disk. - base::SequencedWorkerPool::SequenceToken plugin_list_token_; -#endif #if defined(OS_POSIX) scoped_refptr<PluginLoaderPosix> plugin_loader_; #endif |