summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/plugin_list.h
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/plugins/plugin_list.h')
-rw-r--r--webkit/glue/plugins/plugin_list.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h
index 43cc46d..d2cab7d 100644
--- a/webkit/glue/plugins/plugin_list.h
+++ b/webkit/glue/plugins/plugin_list.h
@@ -53,7 +53,7 @@ class PluginList : public base::RefCounted<PluginList> {
// Add an extra plugin to load when we actually do the loading. This is
// static because we want to be able to add to it without searching the disk
// for plugins. Must be called before the plugins have been loaded.
- static void AddExtraPluginPath(const std::wstring& plugin_path);
+ static void AddExtraPluginPath(const FilePath& plugin_path);
virtual ~PluginList();
@@ -104,7 +104,7 @@ class PluginList : public base::RefCounted<PluginList> {
// Get plugin info by plugin dll path. Returns true if the plugin is found and
// WebPluginInfo has been filled in |info|
- bool GetPluginInfoByDllPath(const std::wstring& dll_path,
+ bool GetPluginInfoByDllPath(const FilePath& dll_path,
WebPluginInfo* info);
private:
// Constructors are private for singletons
@@ -114,27 +114,26 @@ class PluginList : public base::RefCounted<PluginList> {
void LoadPlugins(bool refresh);
// Load all plugins from a specific directory
- void LoadPlugins(const std::wstring &path);
+ void LoadPlugins(const FilePath& path);
- // Load a specific plugin with full path. filename can be mixed case.
- void LoadPlugin(const std::wstring &filename);
+ // Load a specific plugin with full path.
+ void LoadPlugin(const FilePath& filename);
// Returns true if we should load the given plugin, or false otherwise.
- // filename must be lower case.
- bool ShouldLoadPlugin(const std::wstring& filename);
+ bool ShouldLoadPlugin(const FilePath& filename);
// Load internal plugins. Right now there is only one: activex_shim.
void LoadInternalPlugins();
// Find a plugin by filename. Returns -1 if it's not found, otherwise its
- // index in plugins_. filename needs to be lower case.
+ // index in plugins_.
int FindPluginFile(const std::wstring& filename);
// The application path where we expect to find plugins.
- static std::wstring GetPluginAppDirectory();
+ static FilePath GetPluginAppDirectory();
// The executable path where we expect to find plugins.
- static std::wstring GetPluginExeDirectory();
+ static FilePath GetPluginExeDirectory();
// Load plugins from the Firefox install path. This is kind of
// a kludge, but it helps us locate the flash player for users that