Commit d9ace26f authored by deepak1556's avatar deepak1556 Committed by Commit Bot

build: fix when building with enable_plugins=false

Bug: none
Change-Id: If878b3a7f5bb051c6e99c617418475c12754ae90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845624Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703739}
parent 0dbcea96
...@@ -223,6 +223,7 @@ Debashish Samantaray <d.samantaray@samsung.com> ...@@ -223,6 +223,7 @@ Debashish Samantaray <d.samantaray@samsung.com>
Debug Wang <debugwang@tencent.com> Debug Wang <debugwang@tencent.com>
Deepak Dilip Borade <deepak.db@samsung.com> Deepak Dilip Borade <deepak.db@samsung.com>
Deepak Mittal <deepak.m1@samsung.com> Deepak Mittal <deepak.m1@samsung.com>
Deepak Mohan <hop2deep@gmail.com>
Deepak Sharma <deepak.sharma@amd.com> Deepak Sharma <deepak.sharma@amd.com>
Deepak Singla <deepak.s@samsung.com> Deepak Singla <deepak.s@samsung.com>
Deokjin Kim <deokjin81.kim@samsung.com> Deokjin Kim <deokjin81.kim@samsung.com>
......
...@@ -25,12 +25,16 @@ ...@@ -25,12 +25,16 @@
#include "content/public/common/content_client.h" #include "content/public/common/content_client.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/public/common/pepper_plugin_info.h" #include "ppapi/buildflags/buildflags.h"
#include "sandbox/mac/seatbelt_exec.h" #include "sandbox/mac/seatbelt_exec.h"
#include "services/service_manager/sandbox/mac/sandbox_mac.h" #include "services/service_manager/sandbox/mac/sandbox_mac.h"
#include "services/service_manager/sandbox/sandbox_type.h" #include "services/service_manager/sandbox/sandbox_type.h"
#include "services/service_manager/sandbox/switches.h" #include "services/service_manager/sandbox/switches.h"
#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/public/common/pepper_plugin_info.h"
#endif
namespace content { namespace content {
namespace { namespace {
...@@ -162,6 +166,7 @@ void SetupNetworkSandboxParameters(sandbox::SeatbeltExecClient* client) { ...@@ -162,6 +166,7 @@ void SetupNetworkSandboxParameters(sandbox::SeatbeltExecClient* client) {
} }
} }
#if BUILDFLAG(ENABLE_PLUGINS)
void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) { void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) {
SetupCommonSandboxParameters(client); SetupCommonSandboxParameters(client);
...@@ -186,6 +191,7 @@ void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) { ...@@ -186,6 +191,7 @@ void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) {
// to n+1 more than the plugins added. // to n+1 more than the plugins added.
CHECK(index <= 5); CHECK(index <= 5);
} }
#endif
void SetupCDMSandboxParameters(sandbox::SeatbeltExecClient* client) { void SetupCDMSandboxParameters(sandbox::SeatbeltExecClient* client) {
SetupCommonSandboxParameters(client); SetupCommonSandboxParameters(client);
...@@ -226,9 +232,11 @@ void SetupSandboxParameters(service_manager::SandboxType sandbox_type, ...@@ -226,9 +232,11 @@ void SetupSandboxParameters(service_manager::SandboxType sandbox_type,
case service_manager::SANDBOX_TYPE_NETWORK: case service_manager::SANDBOX_TYPE_NETWORK:
SetupNetworkSandboxParameters(client); SetupNetworkSandboxParameters(client);
break; break;
#if BUILDFLAG(ENABLE_PLUGINS)
case service_manager::SANDBOX_TYPE_PPAPI: case service_manager::SANDBOX_TYPE_PPAPI:
SetupPPAPISandboxParameters(client); SetupPPAPISandboxParameters(client);
break; break;
#endif
case service_manager::SANDBOX_TYPE_PROFILING: case service_manager::SANDBOX_TYPE_PROFILING:
case service_manager::SANDBOX_TYPE_UTILITY: case service_manager::SANDBOX_TYPE_UTILITY:
SetupUtilitySandboxParameters(client, command_line); SetupUtilitySandboxParameters(client, command_line);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment