summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.cc
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 16:48:45 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 16:48:45 +0000
commit690a99c80e4fe4e6eda9010b88e4438f57912336 (patch)
tree423390d4af89abd910ffd69f5e446720b1aa5b1f /chrome/renderer/render_view.cc
parent8c643f00166c14b146f8e5e0d2beedddacb58aab (diff)
downloadchromium_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 'chrome/renderer/render_view.cc')
-rw-r--r--chrome/renderer/render_view.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index fdbee76..c94e430 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -235,7 +235,7 @@ void RenderView::PluginDestroyed(WebPluginDelegateProxy* proxy) {
first_default_plugin_ = NULL;
}
-void RenderView::PluginCrashed(const std::wstring& plugin_path) {
+void RenderView::PluginCrashed(const FilePath& plugin_path) {
Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path));
}
@@ -1843,11 +1843,11 @@ WebPluginDelegate* RenderView::CreatePluginDelegate(
std::string* actual_mime_type) {
bool is_gears = false;
if (ShouldLoadPluginInProcess(mime_type, &is_gears)) {
- std::wstring path;
+ FilePath path;
render_thread_->Send(
new ViewHostMsg_GetPluginPath(url, mime_type, clsid, &path,
actual_mime_type));
- if (path.empty())
+ if (path.value().empty())
return NULL;
std::string mime_type_to_use;
@@ -1858,7 +1858,8 @@ WebPluginDelegate* RenderView::CreatePluginDelegate(
if (is_gears)
ChromePluginLib::Create(path, GetCPBrowserFuncsForRenderer());
- return WebPluginDelegateImpl::Create(path, mime_type_to_use, host_window_);
+ return WebPluginDelegateImpl::Create(path,
+ mime_type_to_use, host_window_);
}
WebPluginDelegateProxy* proxy =