diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index 940c983087..2530b7f05d 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -43,8 +43,6 @@ static_library("chrome") { "//chrome/browser/predictors/proxy_lookup_client_impl.h", "//chrome/browser/predictors/resolve_host_client_impl.cc", "//chrome/browser/predictors/resolve_host_client_impl.h", - "//chrome/browser/printing/printing_service.cc", - "//chrome/browser/printing/printing_service.h", "//chrome/browser/ssl/security_state_tab_helper.cc", "//chrome/browser/ssl/security_state_tab_helper.h", "//chrome/browser/ui/autofill/popup_view_common.cc", @@ -164,6 +162,8 @@ static_library("chrome") { "//chrome/browser/printing/printer_query.h", "//chrome/browser/printing/printing_message_filter.cc", "//chrome/browser/printing/printing_message_filter.h", + "//chrome/browser/printing/printing_service.cc", + "//chrome/browser/printing/printing_service.h", ] public_deps += [ diff --git a/patches/chromium/.patches b/patches/chromium/.patches index a49b99d941..db56b29dc2 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -80,3 +80,4 @@ revert_cleanup_remove_menu_subtitles_sublabels.patch ui_views_fix_jumbo_build.patch export_fetchapi_mojo_traits_to_fix_component_build.patch fix_windows_build.patch +build_fix_when_building_with_enable_plugins_false.patch diff --git a/patches/chromium/build_fix_when_building_with_enable_plugins_false.patch b/patches/chromium/build_fix_when_building_with_enable_plugins_false.patch new file mode 100644 index 0000000000..7c7d3ce54d --- /dev/null +++ b/patches/chromium/build_fix_when_building_with_enable_plugins_false.patch @@ -0,0 +1,74 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: deepak1556 +Date: Tue, 8 Oct 2019 15:40:50 +0000 +Subject: build: fix when building with enable_plugins=false + +Bug: none +Change-Id: If878b3a7f5bb051c6e99c617418475c12754ae90 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845624 +Reviewed-by: Robert Sesek +Commit-Queue: Robert Sesek +Cr-Commit-Position: refs/heads/master@{#703739} + +diff --git a/AUTHORS b/AUTHORS +index 6714e69599bc87c47663bec740b91e352ef92780..41aa5584412e4a325d2360691b00c43d7b08f1bb 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -223,6 +223,7 @@ Debashish Samantaray + Debug Wang + Deepak Dilip Borade + Deepak Mittal ++Deepak Mohan + Deepak Sharma + Deepak Singla + Deokjin Kim +diff --git a/content/browser/sandbox_parameters_mac.mm b/content/browser/sandbox_parameters_mac.mm +index 5eead918eb9d9df03c86b5201b3f924643707f4b..a12cc8734c45a4ebb29672306da3a695a883eb9b 100644 +--- a/content/browser/sandbox_parameters_mac.mm ++++ b/content/browser/sandbox_parameters_mac.mm +@@ -25,12 +25,16 @@ + #include "content/public/common/content_client.h" + #include "content/public/common/content_features.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 "services/service_manager/sandbox/mac/sandbox_mac.h" + #include "services/service_manager/sandbox/sandbox_type.h" + #include "services/service_manager/sandbox/switches.h" + ++#if BUILDFLAG(ENABLE_PLUGINS) ++#include "content/public/common/pepper_plugin_info.h" ++#endif ++ + namespace content { + + namespace { +@@ -148,6 +152,7 @@ void SetupNetworkSandboxParameters(sandbox::SeatbeltExecClient* client) { + } + } + ++#if BUILDFLAG(ENABLE_PLUGINS) + void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) { + SetupCommonSandboxParameters(client); + +@@ -172,6 +177,7 @@ void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) { + // to n+1 more than the plugins added. + CHECK(index <= 5); + } ++#endif + + void SetupCDMSandboxParameters(sandbox::SeatbeltExecClient* client) { + SetupCommonSandboxParameters(client); +@@ -212,9 +218,11 @@ void SetupSandboxParameters(service_manager::SandboxType sandbox_type, + case service_manager::SANDBOX_TYPE_NETWORK: + SetupNetworkSandboxParameters(client); + break; ++#if BUILDFLAG(ENABLE_PLUGINS) + case service_manager::SANDBOX_TYPE_PPAPI: + SetupPPAPISandboxParameters(client); + break; ++#endif + case service_manager::SANDBOX_TYPE_PROFILING: + case service_manager::SANDBOX_TYPE_UTILITY: + SetupUtilitySandboxParameters(client, command_line); diff --git a/shell/app/atom_content_client.cc b/shell/app/atom_content_client.cc index c3aa780450..359fa17140 100644 --- a/shell/app/atom_content_client.cc +++ b/shell/app/atom_content_client.cc @@ -15,9 +15,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/content_constants.h" -#include "content/public/common/pepper_plugin_info.h" #include "electron/buildflags/buildflags.h" -#include "ppapi/shared_impl/ppapi_permissions.h" +#include "ppapi/buildflags/buildflags.h" #include "shell/browser/atom_paths.h" #include "shell/common/options_switches.h" #include "ui/base/l10n/l10n_util.h" @@ -37,6 +36,11 @@ #include "shell/common/atom_constants.h" #endif // BUILDFLAG(ENABLE_PDF_VIEWER) +#if BUILDFLAG(ENABLE_PLUGINS) +#include "content/public/common/pepper_plugin_info.h" +#include "ppapi/shared_impl/ppapi_permissions.h" +#endif // BUILDFLAG(ENABLE_PLUGINS) + namespace electron { namespace { @@ -141,6 +145,7 @@ void AddPepperFlashFromCommandLine( } #endif // BUILDFLAG(ENABLE_PEPPER_FLASH) +#if BUILDFLAG(ENABLE_PLUGINS) void ComputeBuiltInPlugins(std::vector* plugins) { #if BUILDFLAG(ENABLE_PDF_VIEWER) content::PepperPluginInfo pdf_info; @@ -161,6 +166,7 @@ void ComputeBuiltInPlugins(std::vector* plugins) { plugins->push_back(pdf_info); #endif // BUILDFLAG(ENABLE_PDF_VIEWER) } +#endif // BUILDFLAG(ENABLE_PLUGINS) void AppendDelimitedSwitchToVector(const base::StringPiece cmd_switch, std::vector* append_me) { @@ -227,7 +233,9 @@ void AtomContentClient::AddPepperPlugins( base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); AddPepperFlashFromCommandLine(command_line, plugins); #endif // BUILDFLAG(ENABLE_PEPPER_FLASH) +#if BUILDFLAG(ENABLE_PLUGINS) ComputeBuiltInPlugins(plugins); +#endif // BUILDFLAG(ENABLE_PLUGINS) } void AtomContentClient::AddContentDecryptionModules( diff --git a/shell/browser/api/atom_api_web_contents.cc b/shell/browser/api/atom_api_web_contents.cc index ee30ec184b..e1aa853569 100644 --- a/shell/browser/api/atom_api_web_contents.cc +++ b/shell/browser/api/atom_api_web_contents.cc @@ -48,6 +48,7 @@ #include "native_mate/converter.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder_deprecated.h" +#include "ppapi/buildflags/buildflags.h" #include "shell/browser/api/atom_api_browser_window.h" #include "shell/browser/api/atom_api_debugger.h" #include "shell/browser/api/atom_api_session.h" @@ -898,10 +899,12 @@ void WebContents::RenderProcessGone(base::TerminationStatus status) { void WebContents::PluginCrashed(const base::FilePath& plugin_path, base::ProcessId plugin_pid) { +#if BUILDFLAG(ENABLE_PLUGINS) content::WebPluginInfo info; auto* plugin_service = content::PluginService::GetInstance(); plugin_service->GetPluginInfoByPath(plugin_path, &info); Emit("plugin-crashed", info.name, info.version); +#endif // BUILDFLAG(ENABLE_PLUIGNS) } void WebContents::MediaStartedPlaying(const MediaPlayerInfo& video_type,