summaryrefslogtreecommitdiffstats
path: root/content/renderer/renderer_main.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 05:06:48 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 05:06:48 +0000
commitdac6a5ac4fff22f2070a99c71472146aebe0192d (patch)
treee311e966952ea95f242e1b56c33354a5532206c7 /content/renderer/renderer_main.cc
parent977a14f06dbb9e9371332e5d7952e923095558fb (diff)
downloadchromium_src-dac6a5ac4fff22f2070a99c71472146aebe0192d.zip
chromium_src-dac6a5ac4fff22f2070a99c71472146aebe0192d.tar.gz
chromium_src-dac6a5ac4fff22f2070a99c71472146aebe0192d.tar.bz2
Split PepperPluginRegistry into the pieces that are needed in each process. content/common only needed a simple method to get the list of pepper plugins. The zygote specific method moves to content/zygote. The rest moves to content/renderer, as that has dependencies on the pepper implementation which depends on blink.
BUG=263054 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/20172004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/renderer_main.cc')
-rw-r--r--content/renderer/renderer_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 5d34342..b179545 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -23,11 +23,11 @@
#include "base/timer/hi_res_timer_manager.h"
#include "content/child/child_process.h"
#include "content/common/content_constants_internal.h"
-#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/browser_plugin/browser_plugin_manager_impl.h"
+#include "content/renderer/pepper/pepper_plugin_registry.h"
#include "content/renderer/pepper/ppapi_interface_factory.h"
#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_thread_impl.h"