From 24df5f96d733a40234cdd7ca9c82a9b5c9d9beb8 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 23 Nov 2024 17:34:51 -0600 Subject: [PATCH] fix: remove unused local variables (#44815) * chore: remove unused local non-trivial variable relaunch_executable became unused in June 2016 in 0d066de5 * chore: only declare program_name local variable if used We declared it everywhere but only used it on Windows * chore: remove unused local non-trivial variable path from UnregisterXWindow it became unused in 2020 by 72a08926 --- shell/browser/api/electron_api_app.cc | 3 +-- shell/browser/relauncher.cc | 1 - shell/browser/ui/views/global_menu_bar_registrar_x11.cc | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc index 9aadb51b0263..ce10c42e5ae6 100644 --- a/shell/browser/api/electron_api_app.cc +++ b/shell/browser/api/electron_api_app.cc @@ -1011,8 +1011,6 @@ bool App::RequestSingleInstanceLock(gin::Arguments* args) { if (HasSingleInstanceLock()) return true; - std::string program_name = electron::Browser::Get()->GetName(); - base::FilePath user_dir; base::PathService::Get(chrome::DIR_USER_DATA, &user_dir); // The user_dir may not have been created yet. @@ -1023,6 +1021,7 @@ bool App::RequestSingleInstanceLock(gin::Arguments* args) { blink::CloneableMessage additional_data_message; args->GetNext(&additional_data_message); #if BUILDFLAG(IS_WIN) + const std::string program_name = electron::Browser::Get()->GetName(); bool app_is_sandboxed = IsSandboxEnabled(base::CommandLine::ForCurrentProcess()); process_singleton_ = std::make_unique( diff --git a/shell/browser/relauncher.cc b/shell/browser/relauncher.cc index c15221181cff..93deae119b62 100644 --- a/shell/browser/relauncher.cc +++ b/shell/browser/relauncher.cc @@ -157,7 +157,6 @@ int RelauncherMain(const content::MainFunctionParams& main_parameters) { // Figure out what to execute, what arguments to pass it, and whether to // start it in the background. bool in_relauncher_args = false; - StringType relaunch_executable; StringVector relauncher_args; StringVector launch_argv; for (size_t argv_index = 2; argv_index < argv.size(); ++argv_index) { diff --git a/shell/browser/ui/views/global_menu_bar_registrar_x11.cc b/shell/browser/ui/views/global_menu_bar_registrar_x11.cc index 76e0940b81b3..5789ae7f40df 100644 --- a/shell/browser/ui/views/global_menu_bar_registrar_x11.cc +++ b/shell/browser/ui/views/global_menu_bar_registrar_x11.cc @@ -80,7 +80,6 @@ void GlobalMenuBarRegistrarX11::RegisterXWindow(x11::Window window) { void GlobalMenuBarRegistrarX11::UnregisterXWindow(x11::Window window) { DCHECK(registrar_proxy_); - std::string path = electron::GlobalMenuBarX11::GetPathForWindow(window); ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/314087 // TODO(erg): The mozilla implementation goes to a lot of callback trouble