diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/shell/app | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/shell/app')
| -rw-r--r-- | chromium/extensions/shell/app/shell_main_delegate.cc | 3 | ||||
| -rw-r--r-- | chromium/extensions/shell/app/shell_main_delegate.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chromium/extensions/shell/app/shell_main_delegate.cc b/chromium/extensions/shell/app/shell_main_delegate.cc index 27b627e3c05..a5e0f6c2c6b 100644 --- a/chromium/extensions/shell/app/shell_main_delegate.cc +++ b/chromium/extensions/shell/app/shell_main_delegate.cc @@ -184,8 +184,7 @@ void ShellMainDelegate::ProcessExiting(const std::string& process_type) { #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) void ShellMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* - delegates) { + std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if BUILDFLAG(ENABLE_NACL) nacl::AddNaClZygoteForkDelegates(delegates); #endif // BUILDFLAG(ENABLE_NACL) diff --git a/chromium/extensions/shell/app/shell_main_delegate.h b/chromium/extensions/shell/app/shell_main_delegate.h index d31688b9e69..5d6842e79b5 100644 --- a/chromium/extensions/shell/app/shell_main_delegate.h +++ b/chromium/extensions/shell/app/shell_main_delegate.h @@ -34,9 +34,8 @@ class ShellMainDelegate : public content::ContentMainDelegate { content::ContentRendererClient* CreateContentRendererClient() override; void ProcessExiting(const std::string& process_type) override; #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) - void ZygoteStarting( - std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* - delegates) override; + void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* + delegates) override; #endif #if defined(OS_LINUX) && !defined(OS_CHROMEOS) void ZygoteForked() override; |