diff options
Diffstat (limited to 'webkit/glue/plugins/plugin_lib.h')
| -rw-r--r-- | webkit/glue/plugins/plugin_lib.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h index 06b7ef9..11b3498 100644 --- a/webkit/glue/plugins/plugin_lib.h +++ b/webkit/glue/plugins/plugin_lib.h @@ -10,6 +10,7 @@ #include <string> #include "base/basictypes.h" +#include "base/file_path.h" #include "base/hash_tables.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" @@ -49,7 +50,7 @@ struct InternalPluginInfo { class PluginLib : public base::RefCounted<PluginLib> { public: virtual ~PluginLib(); - static PluginLib* CreatePluginLib(const std::wstring& filename); + static PluginLib* CreatePluginLib(const FilePath& filename); // Unloads all the loaded plugin dlls and cleans up the plugin map. static void UnloadAllPlugins(); @@ -88,7 +89,7 @@ class PluginLib : public base::RefCounted<PluginLib> { #if defined(OS_WIN) // Helper function to load a plugin. // Returns the module handle on success. - static HMODULE LoadPluginHelper(const std::wstring plugin_file); + static HMODULE LoadPluginHelper(const FilePath plugin_file); #endif int instance_count() const { return instance_count_; } @@ -112,7 +113,7 @@ class PluginLib : public base::RefCounted<PluginLib> { // Returns a WebPluginInfo structure given a plugin's path. Returns NULL if // the dll couldn't be found, or if it's not a plugin. - static WebPluginInfo* ReadWebPluginInfo(const std::wstring &filename); + static WebPluginInfo* ReadWebPluginInfo(const FilePath &filename); // Creates WebPluginInfo structure based on read in or built in // PluginVersionInfo. static WebPluginInfo* CreateWebPluginInfo(const PluginVersionInfo& info); @@ -127,8 +128,8 @@ class PluginLib : public base::RefCounted<PluginLib> { NPSavedData *saved_data_; // persisted plugin info for NPAPI int instance_count_; // count of plugins in use - // A map of all the insantiated plugins. - typedef base::hash_map<std::wstring, scoped_refptr<PluginLib> > PluginMap; + // A map of all the instantiated plugins. + typedef base::hash_map<FilePath, scoped_refptr<PluginLib> > PluginMap; static PluginMap* loaded_libs_; // C-style function pointers |