Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Unified Diff: content/browser/plugin_service.cc

Issue 7044012: Support getting the font list in Pepper. This currently only works out of (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/plugin_service.cc
===================================================================
--- content/browser/plugin_service.cc (revision 85766)
+++ content/browser/plugin_service.cc (working copy)
@@ -22,6 +22,7 @@
#include "content/browser/ppapi_plugin_process_host.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/resource_context.h"
#include "content/common/notification_service.h"
#include "content/common/notification_type.h"
#include "content/common/pepper_plugin_registry.h"
@@ -249,7 +250,8 @@
}
PpapiPluginProcessHost* PluginService::FindOrStartPpapiPluginProcess(
- const FilePath& plugin_path) {
+ const FilePath& plugin_path,
+ PpapiPluginProcessHost::Client* client) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
PpapiPluginProcessHost* plugin_host = FindPpapiPluginProcess(plugin_path);
@@ -262,7 +264,8 @@
return NULL;
// This plugin isn't loaded by any plugin process, so create a new process.
- scoped_ptr<PpapiPluginProcessHost> new_host(new PpapiPluginProcessHost);
+ scoped_ptr<PpapiPluginProcessHost> new_host(new PpapiPluginProcessHost(
+ client->GetResourceContext()->host_resolver()));
if (!new_host->Init(*info)) {
NOTREACHED(); // Init is not expected to fail.
return NULL;
@@ -314,7 +317,8 @@
void PluginService::OpenChannelToPpapiPlugin(
const FilePath& path,
PpapiPluginProcessHost::Client* client) {
- PpapiPluginProcessHost* plugin_host = FindOrStartPpapiPluginProcess(path);
+ PpapiPluginProcessHost* plugin_host = FindOrStartPpapiPluginProcess(
+ path, client);
if (plugin_host)
plugin_host->OpenChannelToPlugin(client);
else // Send error.

Powered by Google App Engine
This is Rietveld 408576698