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

Bug 1183682 - Remove the default browser A/B test for Windows 10 (keep Settings approach). r=gijs

Browse Source
This commit is contained in:
Jared Wein
2015-07-15 10:36:55 -04:00
parent a36aeb646e
commit e53109bd01
4 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -730,7 +730,6 @@ nsWindowsShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers)
}
nsresult rv = LaunchHelper(appHelperPath);
nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (NS_SUCCEEDED(rv) && IsWin8OrLater()) {
if (aClaimAllTypes) {
if (IsWin10OrLater()) {
@@ -751,15 +750,7 @@ nsWindowsShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers)
// Windows 10 blocks attempts to load the
// HTTP Handler association dialog.
if (IsWin10OrLater()) {
if (prefs) {
int32_t abTest;
rv = prefs->GetIntPref("browser.shell.windows10DefaultBrowserABTest", &abTest);
if (NS_SUCCEEDED(rv) && abTest == 0) {
rv = InvokeHTTPOpenAsVerb();
} else {
rv = LaunchModernSettingsDialogDefaultApps();
}
}
rv = LaunchModernSettingsDialogDefaultApps();
} else {
rv = LaunchHTTPHandlerPane();
}
@@ -767,15 +758,12 @@ nsWindowsShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers)
// The above call should never really fail, but just in case
// fall back to showing control panel for all defaults
if (NS_FAILED(rv)) {
if (IsWin10OrLater()) {
rv = LaunchModernSettingsDialogDefaultApps();
} else {
rv = LaunchControlPanelDefaultsSelectionUI();
}
rv = LaunchControlPanelDefaultsSelectionUI();
}
}
}
nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefs) {
(void) prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, true);
}