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

Bug 1789991: correctly detect existing private browsing shortcuts r=bytesized

Browse Source 
This was an oversight during the original implementation in bug 1761291. I updated the code that creates shortcuts there, but not the code that looks at existing ones.

Differential Revision: https://phabricator.services.mozilla.com/D156992
This commit is contained in:
Ben Hearsum
2022-09-12 18:45:32 +00:00
parent 67eb568279
commit ae24a5eb11
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1080,12 +1080,22 @@ static nsresult GetMatchingShortcut(int aCSIDL, const nsAString& aAUMID,
static nsresult FindMatchingShortcut(const nsAString& aAppUserModelId,
const nsAString& aShortcutName,
const bool aPrivateBrowsing,
nsAutoString& aShortcutPath) {
wchar_t exePath[MAXPATHLEN] = {};
if (NS_WARN_IF(NS_FAILED(BinaryPath::GetLong(exePath)))) {
return NS_ERROR_FAILURE;
}
if (aPrivateBrowsing) {
if (!PathRemoveFileSpecW(exePath)) {
return NS_ERROR_FAILURE;
}
if (!PathAppendW(exePath, L"private_browsing.exe")) {
return NS_ERROR_FAILURE;
}
}
int shortcutCSIDLs[] = {CSIDL_COMMON_PROGRAMS, CSIDL_PROGRAMS,
CSIDL_COMMON_DESKTOPDIRECTORY,
CSIDL_DESKTOPDIRECTORY};
@@ -1108,8 +1118,8 @@ static bool HasMatchingShortcutImpl(const nsAString& aAppUserModelId,
const nsAutoString& aShortcutName) {
// unused by us, but required
nsAutoString shortcutPath;
nsresult rv =
FindMatchingShortcut(aAppUserModelId, aShortcutName, shortcutPath);
nsresult rv = FindMatchingShortcut(aAppUserModelId, aShortcutName,
aPrivateBrowsing, shortcutPath);
if (SUCCEEDED(rv)) {
return true;
}
@@ -1404,8 +1414,8 @@ static nsresult PinCurrentAppToTaskbarImpl(bool aCheckOnly,
"PinCurrentAppToTaskbarImpl should be called off main thread only");
nsAutoString shortcutPath;
nsresult rv =
FindMatchingShortcut(aAppUserModelId, aShortcutName, shortcutPath);
nsresult rv = FindMatchingShortcut(aAppUserModelId, aShortcutName,
aPrivateBrowsing, shortcutPath);
if (NS_FAILED(rv)) {
shortcutPath.Truncate();
}