From 6474c92bdcc57520f2beac2bc97e079c2d6a6579 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 14:49:10 +0000 Subject: [PATCH 1/2] fix: override content::ContentMainDelegate::CreateContentClient() Co-authored-by: Shelley Vohr --- shell/app/electron_main_delegate.cc | 9 ++++++--- shell/app/electron_main_delegate.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc index 73d063026ad3e..6ec591d89333e 100644 --- a/shell/app/electron_main_delegate.cc +++ b/shell/app/electron_main_delegate.cc @@ -316,9 +316,6 @@ absl::optional ElectronMainDelegate::BasicStartupComplete() { ::switches::kDisableGpuMemoryBufferCompositorResources); #endif - content_client_ = std::make_unique(); - SetContentClient(content_client_.get()); - return absl::nullopt; } @@ -437,6 +434,12 @@ base::StringPiece ElectronMainDelegate::GetBrowserV8SnapshotFilename() { return ContentMainDelegate::GetBrowserV8SnapshotFilename(); } +content::ContentClient* ElectronMainDelegate::CreateContentClient() { + content_client_ = std::make_unique(); + SetContentClient(content_client_.get()); + return content_client_.get(); +} + content::ContentBrowserClient* ElectronMainDelegate::CreateContentBrowserClient() { browser_client_ = std::make_unique(); diff --git a/shell/app/electron_main_delegate.h b/shell/app/electron_main_delegate.h index 0a8363fb7a90b..ca48a02a3b820 100644 --- a/shell/app/electron_main_delegate.h +++ b/shell/app/electron_main_delegate.h @@ -38,6 +38,7 @@ class ElectronMainDelegate : public content::ContentMainDelegate { void PreSandboxStartup() override; void SandboxInitialized(const std::string& process_type) override; absl::optional PreBrowserMain() override; + content::ContentClient* CreateContentClient() override; content::ContentBrowserClient* CreateContentBrowserClient() override; content::ContentGpuClient* CreateContentGpuClient() override; content::ContentRendererClient* CreateContentRendererClient() override; From dbb8213666f30f047444ae55e43a85cc82eb6e66 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 14:49:17 +0000 Subject: [PATCH 2/2] chore: remove extra call Co-authored-by: Shelley Vohr --- shell/app/electron_main_delegate.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc index 6ec591d89333e..6111b30a11951 100644 --- a/shell/app/electron_main_delegate.cc +++ b/shell/app/electron_main_delegate.cc @@ -436,7 +436,6 @@ base::StringPiece ElectronMainDelegate::GetBrowserV8SnapshotFilename() { content::ContentClient* ElectronMainDelegate::CreateContentClient() { content_client_ = std::make_unique(); - SetContentClient(content_client_.get()); return content_client_.get(); }