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

Unified Diff: content/app/content_main_runner.cc

Issue 1856963002: Remove content/public/plugin and chrome/plugin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_03_content_child_npapi
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « content/BUILD.gn ('k') | content/content_plugin.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 1bca24755af337875f80d7b029e2fe331cbfa399..fefb3212bc55cdd3ba2c8747d336ee54770dc5ff 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -56,7 +56,6 @@
#include "content/public/common/main_function_params.h"
#include "content/public/common/sandbox_init.h"
#include "content/public/gpu/content_gpu_client.h"
-#include "content/public/plugin/content_plugin_client.h"
#include "content/public/renderer/content_renderer_client.h"
#include "content/public/utility/content_utility_client.h"
#include "content/renderer/in_process_renderer_thread.h"
@@ -133,8 +132,6 @@ base::LazyInstance<ContentBrowserClient>
#if !defined(CHROME_MULTIPLE_DLL_BROWSER)
base::LazyInstance<ContentGpuClient>
g_empty_content_gpu_client = LAZY_INSTANCE_INITIALIZER;
-base::LazyInstance<ContentPluginClient>
- g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<ContentRendererClient>
g_empty_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<ContentUtilityClient>
@@ -236,16 +233,9 @@ class ContentClientInitializer {
content_client->gpu_ = &g_empty_content_gpu_client.Get();
}
- if (process_type == switches::kPluginProcess ||
- process_type == switches::kPpapiPluginProcess) {
- if (delegate)
- content_client->plugin_ = delegate->CreateContentPluginClient();
- if (!content_client->plugin_)
- content_client->plugin_ = &g_empty_content_plugin_client.Get();
- // Single process not supported in split dll mode.
- } else if (process_type == switches::kRendererProcess ||
- base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSingleProcess)) {
+ if (process_type == switches::kRendererProcess ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess)) {
if (delegate)
content_client->renderer_ = delegate->CreateContentRendererClient();
if (!content_client->renderer_)
« no previous file with comments | « content/BUILD.gn ('k') | content/content_plugin.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698