mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert remaining JSON service manifests

Browse source 
https://bugs.chromium.org/p/chromium/issues/detail?id=895616
This commit is contained in:
deepak1556 2019-02-14 23:56:43 +05:30 committed by Samuel Attard
parent 04ad579e8f
commit 59703c60ac
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/app/manifests.cc
View file

@ -6,15 +6,15 @@
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "printing/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h"
#include "services/proxy_resolver/proxy_resolver_manifest.h" #include "services/proxy_resolver/public/cpp/manifest.h"
#include "services/service_manager/public/cpp/manifest_builder.h" #include "services/service_manager/public/cpp/manifest_builder.h"
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)
#include "components/services/pdf_compositor/pdf_compositor_manifest.h" #include "components/services/pdf_compositor/public/cpp/manifest.h"
#endif #endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
#include "chrome/services/printing/manifest.h" #include "chrome/services/printing/public/cpp/manifest.h"
#endif #endif
const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() { const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
@ -34,10 +34,10 @@ GetElectronPackagedServicesOverlayManifest() {
static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{ static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
proxy_resolver::GetManifest(), proxy_resolver::GetManifest(),
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)
pdf_compositor::GetManifest(), printing::GetPdfCompositorManifest(),
#endif #endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
chrome_printing::GetManifest(), GetChromePrintingManifest(),
#endif #endif
}}; }};
return *manifests; return *manifests;

6
manifests/BUILD.gn
View file

@ -10,14 +10,14 @@ source_set("manifests") {
deps = [ deps = [
"//printing/buildflags", "//printing/buildflags",
"//services/proxy_resolver:proxy_resolver_manifest", "//services/proxy_resolver/public/cpp:manifest",
] ]
if (enable_basic_printing) { if (enable_basic_printing) {
deps += [ "//components/services/pdf_compositor:pdf_compositor_manifest" ] deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
} }
if (enable_print_preview) { if (enable_print_preview) {
deps += [ "//chrome/services/printing:manifest" ] deps += [ "//chrome/services/printing/public/cpp:manifest" ]
} }
} }