| Index: webkit/plugins/npapi/plugin_list.h
|
| diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h
|
| index bff39c4f26e3fd00fca09d32552115733cb407ae..87ea02dfa73a8f2fc2e6bac230014797cd211b03 100644
|
| --- a/webkit/plugins/npapi/plugin_list.h
|
| +++ b/webkit/plugins/npapi/plugin_list.h
|
| @@ -162,9 +162,11 @@ class WEBKIT_PLUGINS_EXPORT PluginList {
|
| // If no such group exists, an empty string is returned.
|
| string16 GetPluginGroupName(const std::string& identifier);
|
|
|
| - // Load a specific plugin with full path.
|
| - void LoadPlugin(const FilePath& filename,
|
| - ScopedVector<PluginGroup>* plugin_groups);
|
| + // Load a specific plugin with full path. Return true iff loading the plug-in
|
| + // was successful.
|
| + bool LoadPlugin(const FilePath& filename,
|
| + ScopedVector<PluginGroup>* plugin_groups,
|
| + webkit::WebPluginInfo* plugin_info);
|
|
|
| // The following functions are used to support probing for WebPluginInfo
|
| // using a different instance of this class.
|
| @@ -186,7 +188,6 @@ class WEBKIT_PLUGINS_EXPORT PluginList {
|
|
|
| // Adds the given WebPluginInfo to its corresponding group, creating it if
|
| // necessary, and returns the group.
|
| - // Callers need to protect calls to this method by a lock themselves.
|
| PluginGroup* AddToPluginGroups(const webkit::WebPluginInfo& web_plugin_info,
|
| ScopedVector<PluginGroup>* plugin_groups);
|
|
|
|
|