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

Unified Diff: content/browser/plugin_service_impl.cc

Issue 11615002: Exclude PluginService for builds with enable_plugins==0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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_impl.cc
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 2a4376ce94571015a1ecfb59e8286f292de9509e..6de5daca97051ed494bb5c7afac642c6f9f9f905 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -271,7 +271,6 @@ PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
const FilePath& plugin_path,
const FilePath& profile_data_directory,
PpapiPluginProcessHost::PluginClient* client) {
-#if defined(ENABLE_PLUGINS)
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
PpapiPluginProcessHost* plugin_host =
@@ -288,9 +287,6 @@ PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
return PpapiPluginProcessHost::CreatePluginHost(
*info, profile_data_directory,
client->GetResourceContext()->GetHostResolver());
-#else
- return NULL;
-#endif
}
PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess(
@@ -353,7 +349,6 @@ void PluginServiceImpl::OpenChannelToPpapiPlugin(
void PluginServiceImpl::OpenChannelToPpapiBroker(
const FilePath& path,
PpapiPluginProcessHost::BrokerClient* client) {
-#if defined(ENABLE_PLUGINS)
PpapiPluginProcessHost* plugin_host = FindOrStartPpapiBrokerProcess(path);
if (plugin_host) {
plugin_host->OpenChannelToPlugin(client);
@@ -361,7 +356,6 @@ void PluginServiceImpl::OpenChannelToPpapiBroker(
// Send error.
client->OnPpapiChannelOpened(IPC::ChannelHandle(), 0);
}
-#endif
}
void PluginServiceImpl::CancelOpenChannelToNpapiPlugin(
« no previous file with comments | « content/browser/loader/buffered_resource_handler.cc ('k') | content/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698