Commit fc8ec946 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Fix building with enable_pdf = false.

BUG=906304

Change-Id: If47e9af167312aa436a022ae1825621a0df286dc
Reviewed-on: https://chromium-review.googlesource.com/c/1340603Reviewed-by: default avatarDavid Grogan <dgrogan@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609083}
parent b727d575
...@@ -19,6 +19,7 @@ import("//components/spellcheck/spellcheck_build_features.gni") ...@@ -19,6 +19,7 @@ import("//components/spellcheck/spellcheck_build_features.gni")
import("//device/vr/buildflags/buildflags.gni") import("//device/vr/buildflags/buildflags.gni")
import("//extensions/buildflags/buildflags.gni") import("//extensions/buildflags/buildflags.gni")
import("//net/features.gni") import("//net/features.gni")
import("//pdf/features.gni")
import("//ppapi/buildflags/buildflags.gni") import("//ppapi/buildflags/buildflags.gni")
import("//printing/buildflags/buildflags.gni") import("//printing/buildflags/buildflags.gni")
import("//rlz/buildflags/buildflags.gni") import("//rlz/buildflags/buildflags.gni")
...@@ -4216,6 +4217,13 @@ jumbo_split_static_library("browser") { ...@@ -4216,6 +4217,13 @@ jumbo_split_static_library("browser") {
} }
} }
if (enable_pdf) {
deps += [
"//pdf:buildflags",
"//pdf:features",
]
}
if (enable_plugins) { if (enable_plugins) {
sources += [ sources += [
"browsing_data/browsing_data_flash_lso_helper.cc", "browsing_data/browsing_data_flash_lso_helper.cc",
...@@ -4296,7 +4304,6 @@ jumbo_split_static_library("browser") { ...@@ -4296,7 +4304,6 @@ jumbo_split_static_library("browser") {
deps += [ deps += [
"//components/pdf/browser", "//components/pdf/browser",
"//media:media_buildflags", "//media:media_buildflags",
"//pdf:features",
"//ppapi/buildflags", "//ppapi/buildflags",
"//ppapi/proxy:ipc", "//ppapi/proxy:ipc",
"//services/device/public/mojom", "//services/device/public/mojom",
......
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
#include "net/nqe/effective_connection_type.h" #include "net/nqe/effective_connection_type.h"
#include "net/nqe/network_quality_estimator_params.h" #include "net/nqe/network_quality_estimator_params.h"
#include "net/websockets/websocket_basic_handshake_stream.h" #include "net/websockets/websocket_basic_handshake_stream.h"
#include "pdf/buildflags.h"
#include "ppapi/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h"
#include "services/device/public/cpp/device_features.h" #include "services/device/public/cpp/device_features.h"
...@@ -179,7 +180,7 @@ ...@@ -179,7 +180,7 @@
#include "extensions/common/switches.h" #include "extensions/common/switches.h"
#endif // ENABLE_EXTENSIONS #endif // ENABLE_EXTENSIONS
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PDF)
#include "pdf/pdf_features.h" #include "pdf/pdf_features.h"
#endif #endif
...@@ -3838,11 +3839,13 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -3838,11 +3839,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kVizHitTestDrawQuadDescription, kOsAll, flag_descriptions::kVizHitTestDrawQuadDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kEnableVizHitTestDrawQuad)}, FEATURE_VALUE_TYPE(features::kEnableVizHitTestDrawQuad)},
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PDF)
{"pdf-form-save", flag_descriptions::kPdfFormSaveName, {"pdf-form-save", flag_descriptions::kPdfFormSaveName,
flag_descriptions::kPdfFormSaveDescription, kOsDesktop, flag_descriptions::kPdfFormSaveDescription, kOsDesktop,
FEATURE_VALUE_TYPE(chrome_pdf::features::kSaveEditedPDFForm)}, FEATURE_VALUE_TYPE(chrome_pdf::features::kSaveEditedPDFForm)},
#endif // BUILDFLAG(ENABLE_PDF)
#if BUILDFLAG(ENABLE_PLUGINS)
{"pdf-isolation", flag_descriptions::kPdfIsolationName, {"pdf-isolation", flag_descriptions::kPdfIsolationName,
flag_descriptions::kPdfIsolationDescription, kOsDesktop, flag_descriptions::kPdfIsolationDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPdfIsolation)}, FEATURE_VALUE_TYPE(features::kPdfIsolation)},
......
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