diff --git a/filenames.gni b/filenames.gni index 60b06800b2..488058008c 100644 --- a/filenames.gni +++ b/filenames.gni @@ -23,7 +23,6 @@ filenames = { lib_sources_linux = [ "shell/browser/browser_linux.cc", - "shell/browser/electron_browser_main_parts_linux.cc", "shell/browser/lib/power_observer_linux.cc", "shell/browser/lib/power_observer_linux.h", "shell/browser/linux/unity_service.cc", diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc index 15bd0de368..bb1cc5bd29 100644 --- a/shell/browser/electron_browser_main_parts.cc +++ b/shell/browser/electron_browser_main_parts.cc @@ -210,7 +210,6 @@ int ElectronBrowserMainParts::PreEarlyInitialization() { HandleSIGCHLD(); #endif #if BUILDFLAG(IS_LINUX) - SetDesktopStartupId(); ui::OzonePlatform::PreEarlyInitialization(); #endif #if BUILDFLAG(IS_MAC) diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h index d8cced5abf..86897fc9c7 100644 --- a/shell/browser/electron_browser_main_parts.h +++ b/shell/browser/electron_browser_main_parts.h @@ -124,10 +124,6 @@ class ElectronBrowserMainParts : public content::BrowserMainParts { const scoped_refptr& task_runner); #endif -#if BUILDFLAG(IS_LINUX) - void SetDesktopStartupId(); -#endif - #if BUILDFLAG(IS_MAC) void FreeAppDelegate(); void RegisterURLHandler(); diff --git a/shell/browser/electron_browser_main_parts_linux.cc b/shell/browser/electron_browser_main_parts_linux.cc deleted file mode 100644 index e6ab3e4c1b..0000000000 --- a/shell/browser/electron_browser_main_parts_linux.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2022 GitHub, Inc. -// Use of this source code is governed by the MIT license that can be -// found in the LICENSE file. - -#include "shell/browser/electron_browser_main_parts.h" - -#include "base/command_line.h" -#include "base/environment.h" - -namespace electron { - -void ElectronBrowserMainParts::SetDesktopStartupId() { - // TODO(clavin): this was removed upstream in - // https://chromium-review.googlesource.com/c/chromium/src/+/6819616 but it's - // not clear if that was intentional. - auto const env = base::Environment::Create(); - auto* const command_line = base::CommandLine::ForCurrentProcess(); - if (std::optional desktop_startup_id = - env->GetVar("DESKTOP_STARTUP_ID")) - command_line->AppendSwitchASCII("desktop-startup-id", *desktop_startup_id); -} - -} // namespace electron