summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/webplugin_delegate_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/plugins/webplugin_delegate_impl.cc')
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.cc b/webkit/glue/plugins/webplugin_delegate_impl.cc
index a48d7ed..655a37a 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl.cc
@@ -51,7 +51,7 @@ bool WebPluginDelegateImpl::track_popup_menu_patched_ = false;
iat_patch::IATPatchFunction WebPluginDelegateImpl::iat_patch_helper_;
WebPluginDelegateImpl* WebPluginDelegateImpl::Create(
- const std::wstring& filename,
+ const FilePath& filename,
const std::string& mime_type,
gfx::NativeView containing_view) {
scoped_refptr<NPAPI::PluginLib> plugin =
@@ -145,7 +145,7 @@ WebPluginDelegateImpl::WebPluginDelegateImpl(
memset(&window_, 0, sizeof(window_));
const WebPluginInfo& plugin_info = instance_->plugin_lib()->plugin_info();
- std::wstring filename = file_util::GetFilenameFromPath(plugin_info.file);
+ std::wstring filename = plugin_info.file.BaseName().value();
if (instance_->mime_type() == "application/x-shockwave-flash" ||
filename == L"npswf32.dll") {
@@ -365,7 +365,7 @@ void WebPluginDelegateImpl::DidManualLoadFail() {
instance()->DidManualLoadFail();
}
-std::wstring WebPluginDelegateImpl::GetPluginPath() {
+FilePath WebPluginDelegateImpl::GetPluginPath() {
return instance()->plugin_lib()->plugin_info().file;
}