content/utility/utility_thread_impl.cc - Issue 10823434: [6] Moves CreateVersionFromString to plugin_utils and updates the callers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/utility/utility_thread_impl.cc

Issue 10823434: [6] Moves CreateVersionFromString to plugin_utils and updates the callers. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: 2nd CL in series to delete PluginGroup. Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/renderer/chrome_content_renderer_client.cc ('K') | « content/browser/plugin_data_remover_impl.cc ('k') | webkit/plugins/npapi/webplugin_delegate_impl_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/utility/utility_thread_impl.cc

diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc

index 421d24a67d539b8917a3c4d96ef6bcd3feac7fad..5f14e68168584475886e58fd3c328ad266b8ecd8 100644

--- a/content/utility/utility_thread_impl.cc

+++ b/content/utility/utility_thread_impl.cc

@@ -144,13 +144,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));