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

Unified Diff: content/renderer/renderer_main.cc

Issue 8440027: Change renderer_client interface for registering PPAPI Factories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update other renderer_clients Created 9 years, 1 month 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
« no previous file with comments | « content/renderer/mock_content_renderer_client.cc ('k') | content/shell/shell_content_renderer_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 46617803275af6a9b751264012065cced125ec6b..84f0d76c215fbd7f18ee00753ef871df73f3eb44 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -21,10 +21,12 @@
#include "content/common/pepper_plugin_registry.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
+#include "content/public/renderer/content_renderer_client.h"
#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/renderer_main_platform_delegate.h"
#include "ui/base/ui_base_switches.h"
+#include "webkit/plugins/ppapi/ppapi_interface_factory.h"
#if defined(OS_MACOSX)
#include <Carbon/Carbon.h>
@@ -151,6 +153,11 @@ int RendererMain(const content::MainFunctionParams& parameters) {
RendererMainPlatformDelegate platform(parameters);
+ webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager =
+ webkit::ppapi::PpapiInterfaceFactoryManager::GetInstance();
+ content::GetContentClient()->renderer()->RegisterPPAPIInterfaceFactories(
+ factory_manager);
+
base::StatsScope<base::StatsCounterTimer>
startup_timer(content::Counters::renderer_main());
« no previous file with comments | « content/renderer/mock_content_renderer_client.cc ('k') | content/shell/shell_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698