corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1761291: use private browsing wrapper as target for Private Browsing shortcuts r=mhowell

Browse Source 
This ensure the shortcuts will use the correct Visual Elements on the off chance they get pinned to the Start Menu.

Differential Revision: https://phabricator.services.mozilla.com/D151539
This commit is contained in:
Ben Hearsum
2022-08-03 13:49:05 +00:00
parent 84306c60eb
commit 8b2aa4c0eb
4 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
browser/components/shell/nsWindowsShellService.cpp
View File

@@ -65,6 +65,7 @@ PSSTDAPI PropVariantToString(REFPROPVARIANT propvar, PWSTR psz, UINT cch);
#include <mbstring.h>
#define PIN_TO_TASKBAR_SHELL_VERB 5386
#define PRIVATE_BROWSING_BINARY L"private_browsing.exe"
#undef ACCESS_READ
@@ -1322,36 +1323,36 @@ static nsresult PinCurrentAppToTaskbarImpl(bool aCheckOnly,
return NS_OK;
}
nsTArray<nsString> arguments;
if (aPrivateBrowsing) {
nsAutoString arg;
arg.AssignLiteral("-private-window");
arguments.AppendElement(arg);
}
nsAutoString linkName(aShortcutName);
wchar_t exePath[MAXPATHLEN] = {};
if (NS_WARN_IF(NS_FAILED(BinaryPath::GetLong(exePath)))) {
return NS_ERROR_FAILURE;
}
nsAutoString exeStr;
nsCOMPtr<nsIFile> exeFile;
exeStr.Assign(exePath);
nsresult rv = NS_NewLocalFile(exeStr, true, getter_AddRefs(exeFile));
if (!NS_SUCCEEDED(rv)) {
return NS_ERROR_FILE_NOT_FOUND;
if (aPrivateBrowsing) {
nsresult rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(exeFile));
if (!NS_SUCCEEDED(rv)) {
return NS_ERROR_FAILURE;
}
nsAutoString pbExeStr(PRIVATE_BROWSING_BINARY);
rv = exeFile->Append(pbExeStr);
if (!NS_SUCCEEDED(rv)) {
return NS_ERROR_FAILURE;
}
} else {
wchar_t exePath[MAXPATHLEN] = {};
if (NS_WARN_IF(NS_FAILED(BinaryPath::GetLong(exePath)))) {
return NS_ERROR_FAILURE;
}
nsAutoString exeStr(exePath);
nsresult rv = NS_NewLocalFile(exeStr, true, getter_AddRefs(exeFile));
if (!NS_SUCCEEDED(rv)) {
return NS_ERROR_FILE_NOT_FOUND;
}
}
uint16_t iconIndex = aPrivateBrowsing ? IDI_PBMODE : IDI_APPICON;
// Icon indexes are defined as Resource IDs, but CreateShortcutImpl
// needs an index.
iconIndex--;
nsTArray<nsString> arguments;
rv = CreateShortcutImpl(exeFile, arguments, aShortcutName, exeFile,
iconIndex, aAppUserModelId, FOLDERID_Programs,
// Icon indexes are defined as Resource IDs, but
// CreateShortcutImpl needs an index.
IDI_APPICON - 1, aAppUserModelId, FOLDERID_Programs,
linkName, shortcutPath);
if (!NS_SUCCEEDED(rv)) {
return NS_ERROR_FILE_NOT_FOUND;