| Index: webkit/plugins/ppapi/plugin_module.h
|
| diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h
|
| index 4d47459fbdfc84d6805dfe21ed1fe0baa2fd4295..ecf17bbbe75a75be99ac58d745b8f1ae4bd1f457 100644
|
| --- a/webkit/plugins/ppapi/plugin_module.h
|
| +++ b/webkit/plugins/ppapi/plugin_module.h
|
| @@ -26,9 +26,12 @@
|
| #include "webkit/plugins/ppapi/plugin_delegate.h"
|
| #include "webkit/plugins/webkit_plugins_export.h"
|
|
|
| -class FilePath;
|
| typedef void* NPIdentifier;
|
|
|
| +namespace base {
|
| +class FilePath;
|
| +}
|
| +
|
| namespace ppapi {
|
| class CallbackTracker;
|
| class WebKitForwarding;
|
| @@ -83,7 +86,7 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
|
| // all plugin modules. In practice it will be a global singleton that
|
| // tracks which modules are alive.
|
| PluginModule(const std::string& name,
|
| - const FilePath& path,
|
| + const base::FilePath& path,
|
| PluginDelegate::ModuleLifetime* lifetime_delegate,
|
| const ::ppapi::PpapiPermissions& perms);
|
|
|
| @@ -104,7 +107,7 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
|
|
|
| // Initializes this module using the given library path as the plugin.
|
| // Returns true on success. False means that the plugin can not be used.
|
| - bool InitAsLibrary(const FilePath& path);
|
| + bool InitAsLibrary(const base::FilePath& path);
|
|
|
| // Initializes this module for the given out of process proxy. This takes
|
| // ownership of the given pointer, even in the failure case.
|
| @@ -144,7 +147,7 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
|
| PP_Module pp_module() const { return pp_module_; }
|
|
|
| const std::string& name() const { return name_; }
|
| - const FilePath& path() const { return path_; }
|
| + const base::FilePath& path() const { return path_; }
|
| const ::ppapi::PpapiPermissions& permissions() const { return permissions_; }
|
|
|
| PluginInstance* CreateInstance(PluginDelegate* delegate,
|
| @@ -241,7 +244,7 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
|
|
|
| // The name and file location of the module.
|
| const std::string name_;
|
| - const FilePath path_;
|
| + const base::FilePath path_;
|
|
|
| ::ppapi::PpapiPermissions permissions_;
|
|
|
|
|