From c8c93d74828decbda2a7dabe05f8d90b1ffa7053 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra <14110965+ayushmanchhabra@users.noreply.github.com> Date: Sat, 19 Oct 2024 12:37:06 +0530 Subject: [PATCH 1/3] Point Windows taskbar icon to nw.exe instead of chrome_proxy.exe --- chrome/browser/shortcuts/platform_util_win.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chrome/browser/shortcuts/platform_util_win.cc b/chrome/browser/shortcuts/platform_util_win.cc index e5ff01aa7eb0..ebdf84f8f6f5 100644 --- a/chrome/browser/shortcuts/platform_util_win.cc +++ b/chrome/browser/shortcuts/platform_util_win.cc @@ -19,8 +19,9 @@ constexpr base::FilePath::CharType kChromeProxyExecutable[] = base::FilePath GetChromeProxyPath() { base::FilePath chrome_dir; - CHECK(base::PathService::Get(base::DIR_EXE, &chrome_dir)); - return chrome_dir.Append(kChromeProxyExecutable); + // Fixes https://github.com/nwjs/nw.js/issues/8227 + CHECK(base::PathService::Get(base::FILE_EXE, &chrome_dir)); + return chrome_dir; } } // namespace shortcuts From 13ce596bc606e8ecbb5f716ec94529f8628f0301 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra <14110965+ayushmanchhabra@users.noreply.github.com> Date: Sat, 19 Oct 2024 12:49:55 +0530 Subject: [PATCH 2/3] fixup! Point Windows taskbar icon to nw.exe instead of chrome_proxy.exe --- chrome/browser/shortcuts/platform_util_win.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chrome/browser/shortcuts/platform_util_win.cc b/chrome/browser/shortcuts/platform_util_win.cc index ebdf84f8f6f5..65738b5a33d5 100644 --- a/chrome/browser/shortcuts/platform_util_win.cc +++ b/chrome/browser/shortcuts/platform_util_win.cc @@ -12,16 +12,16 @@ namespace shortcuts { namespace { +// Fixes https://github.com/nwjs/nw.js/issues/8227 constexpr base::FilePath::CharType kChromeProxyExecutable[] = - FILE_PATH_LITERAL("chrome_proxy.exe"); + FILE_PATH_LITERAL("nw.exe"); } // namespace base::FilePath GetChromeProxyPath() { - base::FilePath chrome_dir; - // Fixes https://github.com/nwjs/nw.js/issues/8227 - CHECK(base::PathService::Get(base::FILE_EXE, &chrome_dir)); - return chrome_dir; + base::FilePath chrome_dir; + CHECK(base::PathService::Get(base::DIR_EXE, &chrome_dir)); + return chrome_dir.Append(kChromeProxyExecutable); } } // namespace shortcuts From 2097d6bea1f0b8342018195c8086c138525d7af6 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra <14110965+ayushmanchhabra@users.noreply.github.com> Date: Sat, 19 Oct 2024 12:50:59 +0530 Subject: [PATCH 3/3] fixup! fixup! Point Windows taskbar icon to nw.exe instead of chrome_proxy.exe --- chrome/browser/shortcuts/platform_util_win.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/shortcuts/platform_util_win.cc b/chrome/browser/shortcuts/platform_util_win.cc index 65738b5a33d5..0ac87c5deee6 100644 --- a/chrome/browser/shortcuts/platform_util_win.cc +++ b/chrome/browser/shortcuts/platform_util_win.cc @@ -19,7 +19,7 @@ constexpr base::FilePath::CharType kChromeProxyExecutable[] = } // namespace base::FilePath GetChromeProxyPath() { - base::FilePath chrome_dir; + base::FilePath chrome_dir; CHECK(base::PathService::Get(base::DIR_EXE, &chrome_dir)); return chrome_dir.Append(kChromeProxyExecutable); }