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

Changed line endings from crlf to lf in manifests.cc/h (#19382)

Browse source
This commit is contained in:
CezaryKulakowski 2019-07-23 20:17:34 +02:00 • committed by Jeremy Apthorp
parent 38507974d6
commit 2e3d757f46
2 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

130
shell/app/manifests.cc
View file

@ -1,65 +1,65 @@
// Copyright (c) 2019 GitHub, Inc. // Copyright (c) 2019 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "shell/app/manifests.h" #include "shell/app/manifests.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "electron/shell/common/api/api.mojom.h" #include "electron/shell/common/api/api.mojom.h"
#include "printing/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h"
#include "services/proxy_resolver/public/cpp/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/public/cpp/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/public/cpp/manifest.h" #include "chrome/services/printing/public/cpp/manifest.h"
#endif #endif
namespace { namespace {
// TODO(https://crbug.com/781334): Remove these helpers and just update the // TODO(https://crbug.com/781334): Remove these helpers and just update the
// manifest definitions to be marked out-of-process. This is here only to avoid // manifest definitions to be marked out-of-process. This is here only to avoid
// extra churn when transitioning away from content_packaged_services. // extra churn when transitioning away from content_packaged_services.
service_manager::Manifest MakeOutOfProcess( service_manager::Manifest MakeOutOfProcess(
const service_manager::Manifest& manifest) { const service_manager::Manifest& manifest) {
// cpplint.py emits a false positive [build/include_what_you_use] // cpplint.py emits a false positive [build/include_what_you_use]
service_manager::Manifest copy(manifest); // NOLINT service_manager::Manifest copy(manifest); // NOLINT
copy.options.execution_mode = copy.options.execution_mode =
service_manager::Manifest::ExecutionMode::kOutOfProcessBuiltin; service_manager::Manifest::ExecutionMode::kOutOfProcessBuiltin;
return copy; return copy;
} }
} // namespace } // namespace
const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() { const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
static base::NoDestructor<service_manager::Manifest> manifest{ static base::NoDestructor<service_manager::Manifest> manifest{
service_manager::ManifestBuilder() service_manager::ManifestBuilder()
.WithDisplayName("Electron (browser process)") .WithDisplayName("Electron (browser process)")
.RequireCapability("device", "device:geolocation_control") .RequireCapability("device", "device:geolocation_control")
.RequireCapability("proxy_resolver", "factory") .RequireCapability("proxy_resolver", "factory")
.RequireCapability("chrome_printing", "converter") .RequireCapability("chrome_printing", "converter")
.RequireCapability("pdf_compositor", "compositor") .RequireCapability("pdf_compositor", "compositor")
.ExposeInterfaceFilterCapability_Deprecated( .ExposeInterfaceFilterCapability_Deprecated(
"navigation:frame", "renderer", "navigation:frame", "renderer",
service_manager::Manifest::InterfaceList< service_manager::Manifest::InterfaceList<
electron::mojom::ElectronBrowser>()) electron::mojom::ElectronBrowser>())
.Build()}; .Build()};
return *manifest; return *manifest;
} }
const std::vector<service_manager::Manifest>& const std::vector<service_manager::Manifest>&
GetElectronBuiltinServiceManifests() { GetElectronBuiltinServiceManifests() {
static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{ static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
MakeOutOfProcess(proxy_resolver::GetManifest()), MakeOutOfProcess(proxy_resolver::GetManifest()),
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)
MakeOutOfProcess(printing::GetPdfCompositorManifest()), MakeOutOfProcess(printing::GetPdfCompositorManifest()),
#endif #endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
MakeOutOfProcess(GetChromePrintingManifest()), MakeOutOfProcess(GetChromePrintingManifest()),
#endif #endif
}}; }};
return *manifests; return *manifests;
} }

32
shell/app/manifests.h
View file

@ -1,16 +1,16 @@
// Copyright (c) 2019 GitHub, Inc. // Copyright (c) 2019 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef SHELL_APP_MANIFESTS_H_ #ifndef SHELL_APP_MANIFESTS_H_
#define SHELL_APP_MANIFESTS_H_ #define SHELL_APP_MANIFESTS_H_
#include <vector> #include <vector>
#include "services/service_manager/public/cpp/manifest.h" #include "services/service_manager/public/cpp/manifest.h"
const service_manager::Manifest& GetElectronContentBrowserOverlayManifest(); const service_manager::Manifest& GetElectronContentBrowserOverlayManifest();
const std::vector<service_manager::Manifest>& const std::vector<service_manager::Manifest>&
GetElectronBuiltinServiceManifests(); GetElectronBuiltinServiceManifests();
#endif // SHELL_APP_MANIFESTS_H_ #endif // SHELL_APP_MANIFESTS_H_