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 /chrome/browser/plugin_service.cc | |
| 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 'chrome/browser/plugin_service.cc')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index cc6408f..bd37a6f 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -60,18 +60,10 @@ static void NotifyPluginsOfActivation() { // static bool PluginService::enable_chrome_plugins_ = true; -void LoadPluginsFromDiskHook() { - DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI) && - !BrowserThread::CurrentlyOn(BrowserThread::IO)) << - "Can't load plugins on the IO/UI threads since it's very slow."; -} - // static void PluginService::InitGlobalInstance(Profile* profile) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - NPAPI::PluginList::Singleton()->SetPluginLoadHook(LoadPluginsFromDiskHook); - // We first group the plugins and then figure out which groups to disable. PluginUpdater::GetPluginUpdater()->DisablePluginGroupsFromPrefs(profile); |