diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 16:21:11 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 16:21:11 +0000 |
| commit | 79fa3363afd7282bcde23b532b95e93e46eb55f3 (patch) | |
| tree | 7127a544eb1c4b8152c777491c397577952bfbee /content/utility | |
| parent | f10e3c034464f49566faee354e6bcf64647d536b (diff) | |
| download | chromium_src-79fa3363afd7282bcde23b532b95e93e46eb55f3.zip chromium_src-79fa3363afd7282bcde23b532b95e93e46eb55f3.tar.gz chromium_src-79fa3363afd7282bcde23b532b95e93e46eb55f3.tar.bz2 | |
Revert 129322 - revert 128949 (and dependent 129252)
Original review URL: http://codereview.chromium.org/9874001
BUG=120273
TEST=none
TBR=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9844016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
| -rw-r--r-- | content/utility/utility_thread_impl.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 4887b57..cf85fbd 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -147,19 +147,16 @@ void UtilityThreadImpl::OnLoadPlugins( gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); #endif + ScopedVector<webkit::npapi::PluginGroup> plugin_groups; + // TODO(bauerb): If we restart loading plug-ins, we might mess up the logic in + // PluginList::ShouldLoadPlugin due to missing the previously loaded plug-ins + // in |plugin_groups|. for (size_t i = 0; i < plugin_paths.size(); ++i) { - ScopedVector<webkit::npapi::PluginGroup> plugin_groups; - plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups); - - if (plugin_groups.empty()) { + webkit::WebPluginInfo plugin; + if (!plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups, &plugin)) Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i])); - continue; - } - - const webkit::npapi::PluginGroup* group = plugin_groups[0]; - DCHECK_EQ(group->web_plugin_infos().size(), 1u); - - Send(new UtilityHostMsg_LoadedPlugin(i, group->web_plugin_infos().front())); + else + Send(new UtilityHostMsg_LoadedPlugin(i, plugin)); } ReleaseProcessIfNeeded(); |