summaryrefslogtreecommitdiffstats
path: root/content/browser/ppapi_plugin_process_host.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 06:03:56 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 06:03:56 +0000
commit277a111a05b3c230cea9c68977eb5a130386c1ec (patch)
treee611cfe56303c124643d4adc47729d59af55db0d /content/browser/ppapi_plugin_process_host.cc
parent01cec0a407740bd2b5b92a80b1cbaef8e5ee8f9b (diff)
downloadchromium_src-277a111a05b3c230cea9c68977eb5a130386c1ec.zip
chromium_src-277a111a05b3c230cea9c68977eb5a130386c1ec.tar.gz
chromium_src-277a111a05b3c230cea9c68977eb5a130386c1ec.tar.bz2
Hook up the sad plugin painting and the crashed plugin infobars for
out-of-process PPAPI plugins. This mostly just forwards notifications up and provides a way to get the sad plugin image in the PPAPI rendering code. I moved the NPAPI sad tab painting to a new file so that it could be shared between the NPAPI and PPAPI. This also hooks up the name and version information in the task manager for PPAPI plugins. R=jam@chromium.org Review URL: http://codereview.chromium.org/6685091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ppapi_plugin_process_host.cc')
-rw-r--r--content/browser/ppapi_plugin_process_host.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index def01b7d..a4505a9 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -7,7 +7,9 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/process_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/pepper_plugin_registry.h"
#include "chrome/common/render_messages.h"
#include "content/browser/plugin_service.h"
#include "content/browser/renderer_host/render_message_filter.h"
@@ -24,8 +26,10 @@ PpapiPluginProcessHost::~PpapiPluginProcessHost() {
CancelRequests();
}
-bool PpapiPluginProcessHost::Init(const FilePath& path) {
- plugin_path_ = path;
+bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) {
+ plugin_path_ = info.path;
+ set_name(UTF8ToWide(info.name));
+ set_version(UTF8ToWide(info.version));
if (!CreateChannel())
return false;