github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-18 19:05:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: upgrade to Chromium 72.0.3626.52 (#16334)"

Browse Source 
This reverts commit 1918e76913.
This commit is contained in:
Samuel Attard
2019-01-22 12:01:04 -08:00
parent 58a6fe13d6
commit 0b85fb7ea2
178 changed files with 1734 additions and 2102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
atom/utility/atom_content_utility_client.cc
View File

@@ -4,6 +4,7 @@
#include "atom/utility/atom_content_utility_client.h"
#include <string>
#include <utility>
#include "base/command_line.h"
@@ -94,6 +95,11 @@ void AtomContentUtilityClient::RegisterServices(StaticServiceMap* services) {
proxy_resolver_info);
#if BUILDFLAG(ENABLE_PRINTING)
service_manager::EmbeddedServiceInfo pdf_compositor_info;
pdf_compositor_info.factory =
base::BindRepeating(&printing::CreatePdfCompositorService, std::string());
services->emplace(printing::mojom::kServiceName, pdf_compositor_info);
service_manager::EmbeddedServiceInfo printing_info;
printing_info.factory =
base::BindRepeating(&printing::PrintingService::CreateService);
@@ -101,18 +107,4 @@ void AtomContentUtilityClient::RegisterServices(StaticServiceMap* services) {
#endif
}
std::unique_ptr<service_manager::Service>
AtomContentUtilityClient::HandleServiceRequest(
const std::string& service_name,
service_manager::mojom::ServiceRequest request) {
#if BUILDFLAG(ENABLE_PRINTING)
if (service_name == printing::mojom::kServiceName) {
return printing::CreatePdfCompositorService(std::string(),
std::move(request));
}
#endif
return nullptr;
}
} // namespace atom

5
atom/utility/atom_content_utility_client.h
View File

@@ -6,7 +6,6 @@
#define ATOM_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
#include <memory>
#include <string>
#include <vector>
#include "base/compiler_specific.h"
@@ -28,10 +27,6 @@ class AtomContentUtilityClient : public content::ContentUtilityClient {
bool OnMessageReceived(const IPC::Message& message) override;
void RegisterServices(StaticServiceMap* services) override;
std::unique_ptr<service_manager::Service> HandleServiceRequest(
const std::string& service_name,
service_manager::mojom::ServiceRequest request) override;
private:
#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)
std::unique_ptr<printing::PrintingHandler> printing_handler_;