diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 16:48:45 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 16:48:45 +0000 |
| commit | 690a99c80e4fe4e6eda9010b88e4438f57912336 (patch) | |
| tree | 423390d4af89abd910ffd69f5e446720b1aa5b1f /webkit/glue/plugins/webplugin_delegate_impl.cc | |
| parent | 8c643f00166c14b146f8e5e0d2beedddacb58aab (diff) | |
| download | chromium_src-690a99c80e4fe4e6eda9010b88e4438f57912336.zip chromium_src-690a99c80e4fe4e6eda9010b88e4438f57912336.tar.gz chromium_src-690a99c80e4fe4e6eda9010b88e4438f57912336.tar.bz2 | |
Move plugins to FilePaths, some cleanup
Review URL: http://codereview.chromium.org/16456
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/webplugin_delegate_impl.cc')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl.cc | 6 |
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; } |