diff options
| author | ibraaaa@google.com <ibraaaa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 23:08:54 +0000 |
|---|---|---|
| committer | ibraaaa@google.com <ibraaaa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 23:08:54 +0000 |
| commit | 61fcb16bb5045057ab1bf9b87cf48a41ad0b0073 (patch) | |
| tree | 04c53f6353029c06e59c570d836a0da05347e410 /content/utility | |
| parent | 4ac25302300d7d076aad01837803021083ae138d (diff) | |
| download | chromium_src-61fcb16bb5045057ab1bf9b87cf48a41ad0b0073.zip chromium_src-61fcb16bb5045057ab1bf9b87cf48a41ad0b0073.tar.gz chromium_src-61fcb16bb5045057ab1bf9b87cf48a41ad0b0073.tar.bz2 | |
Moves CreateVersionFromString to WebPluginInfo and updates the callers.
6th CL in the series to delete PluginGroup and move Hardcoded plugin group definitions to metadata files.
BUG=124396
Review URL: https://chromiumcodereview.appspot.com/10823434
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
| -rw-r--r-- | content/utility/utility_thread_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 813d673..ebff590 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -112,13 +112,14 @@ void UtilityThreadImpl::OnLoadPlugins( gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); #endif - ScopedVector<webkit::npapi::PluginGroup> plugin_groups; + std::vector<webkit::WebPluginInfo> plugins; // 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) { webkit::WebPluginInfo plugin; - if (!plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups, &plugin)) + if (!plugin_list->LoadPluginIntoPluginList( + plugin_paths[i], &plugins, &plugin)) Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i])); else Send(new UtilityHostMsg_LoadedPlugin(i, plugin)); |