Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 02:09:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 294399 - rebrand firefox for deer park, r=bsmedberg, a=brendan

Browse Source
This commit is contained in:
mconnor%steelgryphon.com 2005-05-20 22:42:50 +00:00
parent ab222a8f83
commit 48c2321b4e
21 changed files with 14 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/app/profile/firefox.js
View File

@ -154,9 +154,6 @@ pref("browser.shell.checkDefaultBrowser", true);
pref("browser.startup.page", 1);
pref("browser.startup.homepage", "resource:/browserconfig.properties");
// These values are deliberately non-localizable for official builds.
pref("browser.startup.homepage_reset", "resource:/browserconfig.properties");
pref("browser.update.resetHomepage", false);
// "browser.startup.homepage_override" was for 4.x
pref("browser.startup.homepage_override.1", false);

3
browser/base/content/browserconfig.properties
View File

@ -1,3 +1,2 @@
# Do NOT localize or otherwise change these values
browser.startup.homepage=http://www.mozilla.org/products/firefox/central.html
browser.startup.homepage_reset=http://www.mozilla.org/products/firefox/central.html
browser.startup.homepage=http://www.mozilla.org/projects/deerpark/

57
browser/components/shell/src/nsWindowsShellService.cpp
View File

@ -294,7 +294,6 @@ nsWindowsShellService::nsWindowsShellService()
{
nsCOMPtr<nsIObserverService> obsServ (do_GetService("@mozilla.org/observer-service;1"));
obsServ->AddObserver(this, "quit-application", PR_FALSE);
obsServ->AddObserver(this, "profile-after-change", PR_FALSE);
}
nsresult
@ -1058,56 +1057,6 @@ nsWindowsShellService::GetRegistryEntry(PRInt32 aHKEYConstant,
return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
static nsresult ResetHomepage()
{
// Reset the homepage to the default value if the user requested the installer do so.
HKEY theKey;
nsresult rv = OpenKeyForWriting("Software\\Mozilla\\Mozilla Firefox", &theKey, PR_FALSE, PR_FALSE);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIPrefBranch> prefs;
nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
if (NS_FAILED(rv)) return rv;
rv = pserve->GetBranch("", getter_AddRefs(prefs));
if (NS_FAILED(rv)) return rv;
char buf[MAX_BUF];
DWORD type, len = sizeof buf;
DWORD result = ::RegQueryValueEx(theKey, "Reset Home Page", 0, &type, (LPBYTE)&buf, &len);
PRBool resetHomepage = PR_FALSE;
prefs->GetBoolPref("browser.update.resetHomepage", &resetHomepage);
if ((REG_SUCCEEDED(result) && (PRBool)(*buf) == PR_TRUE) || resetHomepage) {
prefs->ResetBranch("browser.startup.homepage.");
PRBool hasUserValue;
prefs->PrefHasUserValue("browser.startup.homepage", &hasUserValue);
if (hasUserValue)
prefs->ClearUserPref("browser.startup.homepage");
nsCOMPtr<nsIPrefLocalizedString> pls;
prefs->GetComplexValue("browser.startup.homepage_reset",
NS_GET_IID(nsIPrefLocalizedString),
getter_AddRefs(pls));
if (pls) {
prefs->SetComplexValue("browser.startup.homepage",
NS_GET_IID(nsIPrefLocalizedString),
pls);
}
// Clear all traces of this activity so we don't keep resetting the homepage.
DWORD val = 0;
::RegSetValueEx(theKey, "Reset Home Page", 0, REG_DWORD, (LPBYTE)&val, len);
prefs->PrefHasUserValue("browser.update.resetHomepage", &hasUserValue);
if (hasUserValue)
prefs->ClearUserPref("browser.update.resetHomepage");
}
return NS_OK;
}
NS_IMETHODIMP
nsWindowsShellService::Observe(nsISupports* aObject, const char* aTopic, const PRUnichar* aMessage)
{
@ -1130,12 +1079,6 @@ nsWindowsShellService::Observe(nsISupports* aObject, const char* aTopic, const P
return UnregisterDDESupport();
}
else if (!nsCRT::strcmp("profile-after-change", aTopic)) {
nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
os->RemoveObserver(this, "profile-after-change");
return ResetHomepage();
}
return NS_OK;
}

8
browser/installer/unix/installer.cfg
View File

@ -1,9 +1,9 @@
#filter substitution
VersionLanguage = @AB_CD@
NameCompany = mozilla.org
NameProduct = Mozilla Firefox
NameProductInternal = Mozilla Firefox
ShortNameProduct = Firefox
NameCompany = Mozilla
NameProduct = Deer Park Alpha 1
NameProductInternal = Deer Park Alpha 1
ShortNameProduct = Deer Park
VersionProduct = @MOZ_APP_VERSION@
FileInstallerEXE = @PKG_BASENAME@.installer
FileMainEXE = firefox

21
browser/installer/windows/config.it
View File

@ -308,13 +308,6 @@ Show Dialog=TRUE
Title={ADDL_OPTIONS_TITLE}
Message1={ADDL_OPTIONS_MSG1}
Save Installer=
; The following settings control whether the Recapture Homepage checkbox is displayed.
; For this option to work the file nsResetPref.js must be installed into the
; components directory
Message0=The following checkbox gives users the option of reverting to
the default home page
Show Homepage Option=FALSE
Recapture Homepage=FALSE
[Dialog Advanced Settings]
Show Dialog=TRUE
@ -384,8 +377,6 @@ Message0={COMPLETE_MESSAGE0}
Message1={COMPLETE_MESSAGE1}
Launch App={COMPLETE_LAUNCH}
Launch App Checked=TRUE
Reset Homepage={COMPLETE_RESET_HOMEPAGE}
Reset Homepage Checked=TRUE
Registry Key=SOFTWARE\\$CompanyName$\\$ProductName$
[Dialog Download]
@ -760,17 +751,6 @@ Wait=FALSE
Target=[SETUP PATH]\$MainExeFile$
Parameters=-installer
WorkingDir=[SETUP PATH]
; Additional Options dialog.
Condition=not RecaptureHPChecked
[RunApp1]
Timing=depend reboot
Wait=FALSE
Target=[SETUP PATH]\$MainExeFile$
Parameters=-installer -resetPref browser.startup.homepage
WorkingDir=[SETUP PATH]
; Additional Options dialog.
Condition=RecaptureHPChecked
[Windows Registry0]
Root Key=HKEY_LOCAL_MACHINE
@ -1119,7 +1099,6 @@ UsageMsg Usage={MSG_USAGE}
IDC Use FTP={MSG_USE_FTP}
IDC Use HTTP={MSG_USE_HTTP}
IDC Save Installer Files={MSG_SAVE_LOCALLY}
IDC Recapture Homepage=&Make Netscape.com my home page
IDC Turbo Mode=&Use Quick Launch for faster startup times when possible
Message Download Paused={MSG_DL_PAUSED}
Message NORMAL Restricted Access={MSG_NOT_ADMIN}

1
browser/installer/windows/install.it
View File

@ -66,7 +66,6 @@ COMPLETE_TITLE=@COMPLETE_TITLE@
COMPLETE_MESSAGE0=@COMPLETE_MESSAGE0@
COMPLETE_MESSAGE1=@COMPLETE_MESSAGE1@
COMPLETE_LAUNCH=@COMPLETE_LAUNCH@
COMPLETE_RESET_HOMEPAGE=@COMPLETE_RESET_HOMEPAGE@
DL2_TITLE=@DL2_TITLE@
DL2_MESSAGE0=@DL2_MESSAGE0@
DL2_RETRY=@DL2_RETRY@

6
browser/installer/windows/installer.cfg
View File

@ -1,9 +1,9 @@
#filter substitution
VersionLanguage = @AB_CD@
NameCompany = Mozilla
NameProduct = Mozilla Firefox
NameProductInternal = Mozilla Firefox
ShortNameProduct = Firefox
NameProduct = Deer Park Alpha 1
NameProductInternal = Deer Park Alpha 1
ShortNameProduct = Deer Park
VersionProduct = @MOZ_APP_VERSION@
FileInstallerEXE = @PKG_BASENAME@.installer.exe
FileInstallerMSI = @PKG_BASENAME@.installer.msi

6
browser/locales/en-US/chrome/branding/brand.dtd
View File

@ -1,5 +1,5 @@
<!ENTITY brandShortName "Browser">
<!ENTITY brandFullName "Gecko Browser">
<!ENTITY vendorShortName "Generic">
<!ENTITY brandShortName "Deer Park">
<!ENTITY brandFullName "Deer Park Alpha 1">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY releaseURL "http://www.mozilla.org/">

6
browser/locales/en-US/chrome/branding/brand.properties
View File

@ -1,3 +1,3 @@
brandShortName=Browser
brandFullName=Gecko Browser
vendorShortName=Generic
brandShortName=Deer Park
brandFullName=Deer Park Alpha 1
vendorShortName=Mozilla

1
browser/locales/en-US/installer/installer.inc
View File

@ -90,7 +90,6 @@
#define COMPLETE_MESSAGE0 %s $Version$ was successfully installed.
#define COMPLETE_MESSAGE1 Click Finish to complete Setup.
#define COMPLETE_LAUNCH Launch %s $Version$ now.
#define COMPLETE_RESET_HOMEPAGE Use Firefox Start as my Home Page.
#define DL2_TITLE $ProductShortName$ Setup - Download
#define DL2_MESSAGE0 Setup is downloading the required files now. This may take some time depending on your network connection speed.

20
calendar/installer/windows/config.it
View File

@ -355,13 +355,6 @@ Title=$ProductShortName$ Setup - Additional Options
;*** LOCALIZE ME BABY ***
Message1=Select the following option if you wish to save downloaded Setup files on your own computer. This allows you to re-run Setup without downloading the files again. The Setup files will be saved to the path below.
Save Installer=
; The following settings control whether the Recapture Homepage checkbox is displayed.
; For this option to work the file nsResetPref.js must be installed into the
; components directory
Message0=The following checkbox gives users the option of reverting to
the default home page
Show Homepage Option=FALSE
Recapture Homepage=FALSE
[Dialog Advanced Settings]
Show Dialog=TRUE
@ -882,17 +875,6 @@ Wait=FALSE
Target=[SETUP PATH]\$MainExeFile$
Parameters=-installer
WorkingDir=[SETUP PATH]
; Additional Options dialog.
Condition=not RecaptureHPChecked
[RunApp1]
Timing=depend reboot
Wait=FALSE
Target=[SETUP PATH]\$MainExeFile$
Parameters=-installer -resetPref browser.startup.homepage
WorkingDir=[SETUP PATH]
; Additional Options dialog.
Condition=RecaptureHPChecked
[Windows Registry0]
Root Key=HKEY_LOCAL_MACHINE
@ -1159,8 +1141,6 @@ IDC Use HTTP=Use &HTTP for downloading files
;*** LOCALIZE ME BABY ***
IDC Save Installer Files=&Save installer files locally
;*** LOCALIZE ME BABY ***
IDC Recapture Homepage=&Make Netscape.com my home page
;*** LOCALIZE ME BABY ***
IDC Turbo Mode=&Use Quick Launch for faster startup times when possible
;*** LOCALIZE ME BABY ***
Message Download Paused=Setup has encountered a network problem and has paused the download. If you have just lost your network connection, please click Resume once your network has been reestablished.

20
mail/installer/windows/config.it
View File

@ -319,13 +319,6 @@ Title=$ProductName$ Setup - Additional Options
;*** LOCALIZE ME BABY ***
Message1=Select the following option if you wish to save downloaded Setup files on your own computer. This allows you to re-run Setup without downloading the files again. The Setup files will be saved to the path below.
Save Installer=
; The following settings control whether the Recapture Homepage checkbox is displayed.
; For this option to work the file nsResetPref.js must be installed into the
; components directory
Message0=The following checkbox gives users the option of reverting to
the default home page
Show Homepage Option=FALSE
Recapture Homepage=FALSE
[Dialog Advanced Settings]
Show Dialog=TRUE
@ -788,17 +781,6 @@ Wait=FALSE
Target=[SETUP PATH]\$MainExeFile$
Parameters=-installer
WorkingDir=[SETUP PATH]
; Additional Options dialog.
Condition=not RecaptureHPChecked
[RunApp1]
Timing=depend reboot
Wait=FALSE
Target=[SETUP PATH]\$MainExeFile$
Parameters=-installer -resetPref browser.startup.homepage
WorkingDir=[SETUP PATH]
; Additional Options dialog.
Condition=RecaptureHPChecked
[Windows Registry0]
Root Key=HKEY_LOCAL_MACHINE
@ -1246,8 +1228,6 @@ IDC Use HTTP=Use &HTTP for downloading files
;*** LOCALIZE ME BABY ***
IDC Save Installer Files=&Save installer files locally
;*** LOCALIZE ME BABY ***
IDC Recapture Homepage=&Make Netscape.com my home page
;*** LOCALIZE ME BABY ***
IDC Turbo Mode=&Use Quick Launch for faster startup times when possible
;*** LOCALIZE ME BABY ***
Message Download Paused=Setup has encountered a network problem and has paused the download. If you have just lost your network connection, please click Resume once your network has been reestablished.

4
toolkit/locales/en-US/chrome/mozapps/update/update.dtd
View File

@ -81,7 +81,3 @@
<!ENTITY restart.title "Upgrade Complete">
<!ENTITY restart.updated.label "&brandShortName; successfully downloaded and installed updates. You will have to restart &brandShortName; to complete the update.">
<!ENTITY resetHomepage.label "Use &brandShortName; Start as my Home Page">
<!ENTITY resetHomepage.accesskey "H">

28
toolkit/mozapps/installer/windows/wizard/setup/dialogs.c
View File

@ -2104,7 +2104,6 @@ LRESULT CALLBACK DlgProcInstallSuccessful(HWND hDlg, UINT msg, WPARAM wParam, LO
char szBuf[MAX_BUF];
LPNMHDR notifyMessage;
static BOOL launchAppChecked = TRUE;
static BOOL resetHomepageChecked = TRUE;
DWORD result;
HKEY theKey;
@ -2117,7 +2116,6 @@ LRESULT CALLBACK DlgProcInstallSuccessful(HWND hDlg, UINT msg, WPARAM wParam, LO
SetDlgItemText(hDlg, IDC_STATIC1, diInstallSuccessful.szMessage1);
wsprintf(szBuf, diInstallSuccessful.szLaunchApp, sgProduct.szProductName);
SetDlgItemText(hDlg, IDC_START_APP, szBuf);
SetDlgItemText(hDlg, IDC_RESET_HOMEPAGE, diInstallSuccessful.szResetHomepage);
// The header on the welcome page uses another font.
SendDlgItemMessage(hDlg, IDC_STATIC_TITLE, WM_SETFONT, (WPARAM)sgInstallGui.welcomeTitleFont, 0L);
@ -2125,15 +2123,8 @@ LRESULT CALLBACK DlgProcInstallSuccessful(HWND hDlg, UINT msg, WPARAM wParam, LO
SendDlgItemMessage(hDlg, IDC_STATIC0, WM_SETFONT, (WPARAM)sgInstallGui.definedFont, 0L);
SendDlgItemMessage(hDlg, IDC_STATIC1, WM_SETFONT, (WPARAM)sgInstallGui.definedFont, 0L);
SendDlgItemMessage(hDlg, IDC_START_APP, WM_SETFONT, (WPARAM)sgInstallGui.definedFont, 0L);
SendDlgItemMessage(hDlg, IDC_RESET_HOMEPAGE, WM_SETFONT, (WPARAM)sgInstallGui.definedFont, 0L);
#ifndef MOZ_PHOENIX
// Hide the "Reset Homepage" item for non-Firefox installers.
ShowWindow(GetDlgItem(hDlg, IDC_RESET_HOMEPAGE), SW_HIDE);
#endif
launchAppChecked = diInstallSuccessful.bLaunchAppChecked;
resetHomepageChecked = diInstallSuccessful.bResetHomepageChecked;
// Subclass dialog to paint all static controls white.
OldDialogWndProc = SubclassWindow(hDlg, (WNDPROC)NewDialogWndProc);
@ -2149,8 +2140,6 @@ LRESULT CALLBACK DlgProcInstallSuccessful(HWND hDlg, UINT msg, WPARAM wParam, LO
// Restore state from default or cached value.
CheckDlgButton(hDlg, IDC_START_APP,
launchAppChecked ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hDlg, IDC_RESET_HOMEPAGE,
resetHomepageChecked ? BST_CHECKED : BST_UNCHECKED);
// Don't show the back button here UNLESS the previous
// page was Windows Integration - and that only happens on a custom
@ -2162,26 +2151,9 @@ LRESULT CALLBACK DlgProcInstallSuccessful(HWND hDlg, UINT msg, WPARAM wParam, LO
// Store the checkbox state in case the user goes back to any post-install
// pages that we might add.
launchAppChecked = IsDlgButtonChecked(hDlg, IDC_START_APP) == BST_CHECKED;
resetHomepageChecked = IsDlgButtonChecked(hDlg, IDC_RESET_HOMEPAGE) == BST_CHECKED;
break;
case PSN_WIZFINISH:
#ifdef MOZ_PHOENIX
// Store the "Reset Homepage" preference in the Registry.
resetHomepageChecked = IsDlgButtonChecked(hDlg, IDC_RESET_HOMEPAGE) == BST_CHECKED;
if (resetHomepageChecked) {
result = RegOpenKeyEx(HKEY_CURRENT_USER, diInstallSuccessful.szRegistryKey, 0, KEY_READ | KEY_WRITE, &theKey);
if (result == ERROR_FILE_NOT_FOUND)
result = RegCreateKey(HKEY_CURRENT_USER, diInstallSuccessful.szRegistryKey, &theKey);
if (result == ERROR_SUCCESS) {
RegSetValueEx(theKey, "Reset Home Page", 0, REG_DWORD,
(LPBYTE)&(resetHomepageChecked),
sizeof(DWORD));
}
}
#endif
// Store state from the "Run App Now" checkbox. ProcessFileOpsForAll
// uses this variable to decide whether or not to launch the browser.
gbIgnoreRunAppX = IsDlgButtonChecked(hDlg, IDC_START_APP) != BST_CHECKED;

22
toolkit/mozapps/installer/windows/wizard/setup/extra.c
View File

@ -3722,8 +3722,6 @@ HRESULT InitDlgAdditionalOptions(diDO *diDialog)
{
diDialog->bShowDialog = FALSE;
diDialog->bSaveInstaller = FALSE;
diDialog->bRecaptureHomepage = FALSE;
diDialog->bShowHomepageOption = FALSE;
diDialog->dwUseProtocol = UP_FTP;
diDialog->bUseProtocolSettings = TRUE;
diDialog->bShowProtocols = TRUE;
@ -3855,7 +3853,6 @@ HRESULT InitDlgInstallSuccessful(diIS *diDialog)
{
diDialog->bShowDialog = FALSE;
diDialog->bLaunchAppChecked = TRUE;
diDialog->bResetHomepageChecked = TRUE;
if((diDialog->szTitle = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessage0 = NS_GlobalAlloc(MAX_BUF)) == NULL)
@ -3864,8 +3861,6 @@ HRESULT InitDlgInstallSuccessful(diIS *diDialog)
return(1);
if((diDialog->szLaunchApp = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szResetHomepage = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szRegistryKey = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessageHeader = NS_GlobalAlloc(MAX_BUF)) == NULL)
@ -3880,7 +3875,6 @@ void DeInitDlgInstallSuccessful(diIS *diDialog)
FreeMemory(&(diDialog->szMessage0));
FreeMemory(&(diDialog->szMessage1));
FreeMemory(&(diDialog->szLaunchApp));
FreeMemory(&(diDialog->szResetHomepage));
FreeMemory(&(diDialog->szRegistryKey));
FreeMemory(&(diDialog->szMessageHeader));
}
@ -7592,14 +7586,6 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
if(lstrcmpi(szBuf, "TRUE") == 0)
diAdditionalOptions.bSaveInstaller = TRUE;
GetConfigIniProfileString("Dialog Additional Options", "Recapture Homepage", "", szBuf, sizeof(szBuf));
if(lstrcmpi(szBuf, "TRUE") == 0)
diAdditionalOptions.bRecaptureHomepage = TRUE;
GetConfigIniProfileString("Dialog Additional Options", "Show Homepage Option", "", szBuf, sizeof(szBuf));
if(lstrcmpi(szBuf, "TRUE") == 0)
diAdditionalOptions.bShowHomepageOption = TRUE;
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diAdditionalOptions.bShowDialog = TRUE;
@ -7694,10 +7680,6 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
GetConfigIniProfileString("Dialog Install Successful", "Launch App Checked", "", szShowDialog, MAX_BUF);
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diInstallSuccessful.bLaunchAppChecked = TRUE;
GetConfigIniProfileString("Dialog Install Successful", "Reset Homepage", "", diInstallSuccessful.szResetHomepage, MAX_BUF);
GetConfigIniProfileString("Dialog Install Successful", "Reset Homepage Checked", "", szShowDialog, MAX_BUF);
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diInstallSuccessful.bResetHomepageChecked = TRUE;
GetConfigIniProfileString("Dialog Install Successful", "Registry Key", "", diInstallSuccessful.szRegistryKey, MAX_BUF);
/* Download dialog */
@ -7740,7 +7722,6 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diDownloading.bShowDialog = FALSE;
diInstallSuccessful.bShowDialog = FALSE;
diInstallSuccessful.bLaunchAppChecked = FALSE;
diInstallSuccessful.bResetHomepageChecked = FALSE;
break;
}
@ -9393,8 +9374,5 @@ BOOL ShowAdditionalOptionsDialog(void)
if(diAdditionalOptions.bShowDialog == FALSE)
return(FALSE);
if( (diAdditionalOptions.bShowHomepageOption == FALSE) && (GetTotalArchivesToDownload() < 1) )
return(FALSE);
return(TRUE);
}

6
toolkit/mozapps/installer/windows/wizard/setup/ifuncns.c
View File

@ -146,12 +146,6 @@ HRESULT MeetCondition(LPSTR szSection)
if(strcmp(szBuf, sgProduct.szAppID) == 0)
bResult = TRUE;
}
// The condition "RecaptureHPChecked" is met if the RecaptureHome checkbox in "Additional Options" dialog.
// has been checked by the user.
else if(strcmp(pszCondition, "RecaptureHPChecked") == 0)
{
bResult = diAdditionalOptions.bRecaptureHomepage;
}
if(bNegateTheResult)
return !bResult;

4
toolkit/mozapps/installer/windows/wizard/setup/setup.h
View File

@ -449,8 +449,6 @@ typedef struct dlgAdditionalOptions
LPSTR szMessage0;
LPSTR szMessage1;
BOOL bSaveInstaller;
BOOL bRecaptureHomepage;
BOOL bShowHomepageOption;
DWORD dwUseProtocol;
BOOL bUseProtocolSettings;
BOOL bShowProtocols;
@ -504,10 +502,8 @@ typedef struct dlgInstallSuccessful
LPSTR szMessageHeader;
LPSTR szMessage0;
LPSTR szMessage1;
LPSTR szResetHomepage;
LPSTR szRegistryKey;
LPSTR szLaunchApp;
BOOL bResetHomepageChecked;
BOOL bLaunchAppChecked;
} diIS;

1
toolkit/mozapps/installer/windows/wizard/setuprsc/setuprsc.h
View File

@ -110,7 +110,6 @@
#define DLG_INSTALL_SUCCESSFUL 1089
#define IDC_START_APP 1090
#define IDC_MESSAGE_UPGRADE 1091
#define IDC_RESET_HOMEPAGE 1091
#define IDC_CHECK_SAFE_INSTALL 1092
#define IDC_MESSAGE_INFO 1093
#define IDC_APP_ICON 1094

2
toolkit/mozapps/installer/windows/wizard/setuprsc/setuprsc.rc
View File

@ -371,8 +371,6 @@ BEGIN
LTEXT "",IDC_STATIC0,130,34,180,16,NOT WS_GROUP
CONTROL "",IDC_START_APP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY |
WS_TABSTOP,130,139,180,10
CONTROL "",IDC_RESET_HOMEPAGE,"Button",BS_AUTOCHECKBOX | BS_NOTIFY |
WS_TABSTOP,130,124,180,10
END

15
toolkit/mozapps/update/content/update.js
View File

@ -109,10 +109,6 @@ var gUpdateWizard = {
succeeded: true,
#ifdef MOZ_PHOENIX
offeredResetHomepage: false,
#endif
appComps: {
upgraded: {
core : [],
@ -170,13 +166,6 @@ var gUpdateWizard = {
this.clearExtensionUpdatePrefs();
}
}
#ifdef MOZ_PHOENIX
if (this.offeredResetHomepage) {
pref.setBoolPref("browser.update.resetHomepage",
document.getElementById("resetHomepage").checked);
}
#endif
// Send an event to refresh any FE notification components.
var os = Components.classes["@mozilla.org/observer-service;1"]
@ -1014,10 +1003,6 @@ var gRestartPage = {
gUpdateWizard.setButtonLabels(null, true, null, true, null, true);
// XXXben - we should really have a way to restart the app now from here!
#ifdef MOZ_PHOENIX
gUpdateWizard.offeredResetHomepage = true;
#endif
document.documentElement.getButton("finish").focus();

9
toolkit/mozapps/update/content/update.xul
View File

@ -247,15 +247,6 @@
<label>&restart.updated.label;</label>
#ifdef MOZ_PHOENIX
<separator/>
<vbox align="start">
<checkbox id="resetHomepage" checked="true"
label="&resetHomepage.label;" accesskey="&resetHomepage.accesskey;"/>
</vbox>
#endif
</wizardpage>
</wizard>