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

chore: bump chromium to adc5df74b86afdff676989ced8cd3 (master) (#26223)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot 2020-11-13 16:16:56 -08:00 • committed by GitHub
parent d6019634f9
commit e017d8714e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
95 changed files with 496 additions and 804 deletions
Download patch file Download diff file Expand all files Collapse all files

20
shell/utility/electron_content_utility_client.cc
View file

@ -121,29 +121,25 @@ bool ElectronContentUtilityClient::OnMessageReceived(
return false;
}
mojo::ServiceFactory*
ElectronContentUtilityClient::GetMainThreadServiceFactory() {
static base::NoDestructor<mojo::ServiceFactory> factory {
void ElectronContentUtilityClient::RegisterMainThreadServices(
mojo::ServiceFactory& services) {
#if defined(OS_WIN)
RunWindowsIconReader,
services.Add(RunWindowsIconReader);
#endif
#if BUILDFLAG(ENABLE_PRINTING)
RunPrintCompositor,
services.Add(RunPrintCompositor);
#endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
(BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN))
RunPrintingService,
services.Add(RunPrintingService);
#endif
};
return factory.get();
}
mojo::ServiceFactory*
ElectronContentUtilityClient::GetIOThreadServiceFactory() {
static base::NoDestructor<mojo::ServiceFactory> factory{RunProxyResolver};
return factory.get();
void ElectronContentUtilityClient::RegisterIOThreadServices(
mojo::ServiceFactory& services) {
services.Add(RunProxyResolver);
}
} // namespace electron

8
shell/utility/electron_content_utility_client.h
View file

@ -18,6 +18,10 @@ namespace printing {
class PrintingHandler;
}
namespace mojo {
class ServiceFactory;
} // namespace mojo
namespace electron {
class ElectronContentUtilityClient : public content::ContentUtilityClient {
@ -27,8 +31,8 @@ class ElectronContentUtilityClient : public content::ContentUtilityClient {
void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
bool OnMessageReceived(const IPC::Message& message) override;
mojo::ServiceFactory* GetMainThreadServiceFactory() override;
mojo::ServiceFactory* GetIOThreadServiceFactory() override;
void RegisterMainThreadServices(mojo::ServiceFactory& services) override;
void RegisterIOThreadServices(mojo::ServiceFactory& services) override;
private:
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN)